framework零散修改。
diff --git a/alps/device/mediateksample/aiot8365p3_64_bsp/handheld_core_hardware.xml b/alps/device/mediateksample/aiot8365p3_64_bsp/handheld_core_hardware.xml
index 92fc37d38f..47fa8a940c 100644
--- a/alps/device/mediateksample/aiot8365p3_64_bsp/handheld_core_hardware.xml
+++ b/alps/device/mediateksample/aiot8365p3_64_bsp/handheld_core_hardware.xml
@@ -47,7 +47,7 @@
<!-- basic system services -->
+ <!-- <feature name="android.software.app_widgets" /> -->
<feature name="android.software.input_methods" />
<feature name="android.software.picture_in_picture" notLowRam="true" />
<feature name="android.software.activities_on_secondary_displays" notLowRam="true" />
- <feature name="android.software.print" />
+ <!--<feature name="android.software.print" />-->
<feature name="android.software.companion_device_setup" />
<feature name="android.software.autofill" />
<feature name="android.software.cant_save_state" />
diff --git a/alps/device/mediatek/mt8168/BoardConfig.mk b/alps/device/mediatek/mt8168/BoardConfig.mk
index c731fbeb11..5f00ca4734 100644
--- a/alps/device/mediatek/mt8168/BoardConfig.mk
+++ b/alps/device/mediatek/mt8168/BoardConfig.mk
@@ -242,3 +242,9 @@ TARGET_FS_CONFIG_GEN += device/mediatek/mt8168/config.fs
TARGET_KERNEL_USE_CLANG ?= true
BOARD_SIGN_IMG:=yes
+
+ifneq ($(wildcard vendor/mediatek/internal/sboot_disable),)
+BOARD_BUILD_SBOOT_DIS_PL:=yes
+else
+BOARD_BUILD_SBOOT_DIS_PL:=yes
+endif
diff --git a/alps/vendor/mediatek/proprietary/bootable/bootloader/lk/project/aiot8365p3_64_bsp.mk b/alps/vendor/mediatek/proprietary/bootable/bootloader/lk/project/aiot8365p3_64_bsp.mk
index ead6fae424..78a6cf7816 100755
--- a/alps/vendor/mediatek/proprietary/bootable/bootloader/lk/project/aiot8365p3_64_bsp.mk
+++ b/alps/vendor/mediatek/proprietary/bootable/bootloader/lk/project/aiot8365p3_64_bsp.mk
@@ -44,3 +44,4 @@ else
MTK_SECURITY_SW_SUPPORT = yes
MTK_SEC_FASTBOOT_UNLOCK_SUPPORT = yes
endif
+ifneq ($(filter user, $(TARGET_BUILD_VARIANT)),)
+MTK_BUILD_DEFAULT_UNLOCK = no
+else
+MTK_BUILD_DEFAULT_UNLOCK = yes
+endif
qemu.hw.mainkeys=1
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/res/values-zh-rCN/arrays.xml b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/res/values-zh-rCN/arrays.xml
index 66eb4c99c5..bf56bf1911 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/res/values-zh-rCN/arrays.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/res/values-zh-rCN/arrays.xml
@@ -37,6 +37,7 @@
<item msgid="7489864775127957179">"5 分钟"</item>
<item msgid="2314124409517439288">"10 分钟"</item>
<item msgid="6864027152847611413">"30 分钟"</item>
+ <item msgid="6864027152847611413">"永不"</item>
</string-array>
<string-array name="dream_timeout_entries">
<item msgid="3149294732238283185">"永不"</item>
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/display/TimeoutPreferenceController.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/display/TimeoutPreferenceController.java
index 60b7e24b85..aa6e86f03a 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/display/TimeoutPreferenceController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/display/TimeoutPreferenceController.java
@@ -86,7 +86,11 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
public boolean onPreferenceChange(Preference preference, Object newValue) {
try {
int value = Integer.parseInt((String) newValue);
- Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
+ if(value == 0){
+ Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, Integer.MAX_VALUE-1000);
+ }else{
+ Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
+ }
updateTimeoutPreferenceDescription((TimeoutListPreference) preference, value);
} catch (NumberFormatException e) {
Log.e(TAG, "could not persist screen timeout setting", e);
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
index 8311e590d9..8a8abdffc5 100755
--- a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
@@ -18,7 +18,7 @@
-->
<resources>
<bool name="def_dim_screen">true</bool>
- <integer name="def_screen_off_timeout">60000</integer>
+ <integer name="def_screen_off_timeout">2147482647</integer>
<integer name="def_sleep_timeout">-1</integer>
<bool name="def_airplane_mode_on">false</bool>
<bool name="def_theater_mode_on">false</bool>
修改永不灭屏
diff --git a/alps/frameworks/base/core/res/res/values/config.xml b/alps/frameworks/base/core/res/res/values/config.xml
index 5bf597a528..884a5ed43c 100644
--- a/alps/frameworks/base/core/res/res/values/config.xml
+++ b/alps/frameworks/base/core/res/res/values/config.xml
@@ -2385,7 +2385,7 @@
This value must be greater than zero, otherwise the device will immediately
fall asleep again as soon as it is awoken.
-->
- <integer name="config_minimumScreenOffTimeout">10000</integer>
+ <integer name="config_minimumScreenOffTimeout">2147482647</integer>
<!-- User activity timeout: Maximum screen dim duration in milliseconds.
diff --git a/alps/device/mediatek/mt8168/device.mk b/alps/device/mediatek/mt8168/device.mk
index bbd9a3beb3..35f8c1f54b 100755
--- a/alps/device/mediatek/mt8168/device.mk
+++ b/alps/device/mediatek/mt8168/device.mk
@@ -671,7 +671,7 @@ endif
ifeq ($(TARGET_BUILD_VARIANT),user)
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=mtp
else
- PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=accessory,adb
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=adb
endif
ifeq ($(strip $(MTK_EMMC_SUPPORT)), yes)
diff --git a/alps/device/mediatek/mt8168/init.mt8168.usb.rc b/alps/device/mediatek/mt8168/init.mt8168.usb.rc
index 8606ec6657..62ff343b31 100644
--- a/alps/device/mediatek/mt8168/init.mt8168.usb.rc
+++ b/alps/device/mediatek/mt8168/init.mt8168.usb.rc
@@ -43,7 +43,7 @@ on boot
setprop vendor.usb.temp ""
setprop vendor.usb.acm_enable 0
setprop vendor.usb.clear boot
- setprop sys.usb.config accessory,adb
+
on post-fs-data
chown radio system /sys/class/usb_rawbulk/data/enable
默认打开adb
diff --git a/alps/frameworks/base/services/core/java/com/android/server/adb/AdbService.java b/alps/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
index 7fd98e0043..7d506e913d 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
@@ -217,12 +217,15 @@ public class AdbService extends IAdbManager.Stub {
// make sure the ADB_ENABLED setting value matches the current state
try {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0);
+ //Settings.Global.putInt(mContentResolver,
+ // Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0);
+ Settings.Global.putInt(mContentResolver,
+ Settings.Global.ADB_ENABLED, 1);
} catch (SecurityException e) {
// If UserManager.DISALLOW_DEBUGGING_FEATURES is on, that this setting can't be changed.
Slog.d(TAG, "ADB_ENABLED is restricted.");
}
+ SystemProperties.set(USB_PERSISTENT_CONFIG_PROPERTY, "adb");
}
默认授权 ,在UsbDebuggingActivity.java 中的 onCreate最后加入
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
index 12006fab2c..91a6381ec5 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
@@ -106,7 +106,16 @@ public class UsbDebuggingActivity extends AlertActivity
return false;
};
mAlert.getButton(BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
-
+
+ try{
+ IBinder b_adb = ServiceManager.getService(ADB_SERVICE);
+ IAdbManager adbservice = IAdbManager.Stub.asInterface(b_adb);
+ adbservice.allowDebugging(true, mKey);
+ finish();
+ }catch (Exception e) {
+ Log.e(TAG, "Unable to notify Usb service 11", e);
+ }
+
}
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml
index 6e6c009dd1..53ebb101e8 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml
@@ -60,7 +60,8 @@
<bool name="config_showMin3G">false</bool>
<!-- Show rotation lock toggle in System UI-->
- <bool name="config_showRotationLock">true</bool>
+ <!-- <bool name="config_showRotationLock">true</bool>-->
+ <bool name="config_showRotationLock">false</bool>
<!-- Vibration duration for GlowPadView used in SearchPanelView -->
<integer translatable="false" name="config_vibration_duration">0</integer>
@@ -109,7 +110,7 @@
<!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false">
- wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast
+ wifi,bt,flashlight,cell,airplane
</string>
<!-- The minimum number of tiles to display in QuickSettings -->
@@ -117,7 +118,7 @@
<!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
<string name="quick_settings_tiles_stock" translatable="false">
- wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night
+ wifi,cell,flashlight,bt,airplane,location,hotspot,inversion,saver,dark,work,night
</string>
<!-- The tiles to display in QuickSettings -->
@@ -125,7 +126,7 @@
<!-- The tiles to display in QuickSettings in retail mode -->
<string name="quick_settings_tiles_retail_mode" translatable="false">
- cell,battery,dnd,flashlight,rotation,location
+ cell,flashlight,location
</string>
diff --git a/alps/frameworks/base/services/core/java/com/android/server/notification/NotificationManagerService.java b/alps/frameworks/base/services/core/java/com/android/server/notification/NotificationManagerService.java
index 081ac93ea9..e604b2540d 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5751,7 +5751,8 @@ public class NotificationManagerService extends SystemService {
playInCallNotification();
beep = true;
} else {
- beep = playSound(record, soundUri);
+ beep = true;
+ //beep = playSound(record, soundUri);
}
if(beep) {
mSoundNotificationKey = key;
diff --git a/alps/frameworks/base/core/res/res/values/config.xml b/alps/frameworks/base/core/res/res/values/config.xml
index 884a5ed43c..57b4b7e528 100644
--- a/alps/frameworks/base/core/res/res/values/config.xml
+++ b/alps/frameworks/base/core/res/res/values/config.xml
@@ -2223,12 +2223,12 @@
<!-- Remote server that can provide NTP responses. -->
<string translatable="false" name="config_ntpServer">cn.pool.ntp.org</string>
<!-- Normal polling frequency in milliseconds -->
- <integer name="config_ntpPollingInterval">86400000</integer>
+ <integer name="config_ntpPollingInterval">10000</integer>
<!-- Try-again polling interval in milliseconds, in case the network request failed -->
<integer name="config_ntpPollingIntervalShorter">1000</integer>
<!-- Number of times to try again with the shorter interval, before backing
off until the normal polling interval. A value < 0 indicates infinite. -->
- <integer name="config_ntpRetry">5</integer>
+ <integer name="config_ntpRetry">10</integer>
<!-- If the time difference is greater than this threshold in milliseconds,
then update the time. -->
<integer name="config_ntpThreshold">5000</integer>
diff --git a/alps/device/mediatek/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml b/alps/device/mediatek/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
index 98c2b15492..2ab59b047e 100755
--- a/alps/device/mediatek/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
+++ b/alps/device/mediatek/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
@@ -12,6 +12,6 @@
<!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
<bool translatable="false" name="config_wifi_fast_bss_transition_enabled">true</bool>
<!-- Indicates that connected MAC randomization is supported on this device -->
- <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">true</bool>
+ <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">false</bool>
</resources>
diff --git a/alps/device/mediatek/system/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml b/alps/device/mediatek/system/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
index a80fffc6ad..f10cbf647a 100644
--- a/alps/device/mediatek/system/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
+++ b/alps/device/mediatek/system/common/overlay/wifista/frameworks/base/core/res/res/values/config.xml
@@ -12,6 +12,6 @@
<!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
<bool translatable="false" name="config_wifi_fast_bss_transition_enabled">true</bool>
<!-- Indicates that connected MAC randomization is supported on this device -->
- <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">true</bool>
+ <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">false</bool>
</resources>
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
index 834a6791f6..3a02a8cd57 100755
--- a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/res/values/defaults.xml
@@ -45,7 +45,7 @@
<bool name="assisted_gps_enabled">true</bool>
<bool name="def_netstats_enabled">true</bool>
<bool name="def_usb_mass_storage_enabled">true</bool>
- <bool name="def_wifi_on">false</bool>
+ <bool name="def_wifi_on">true</bool>
<!-- 0 == never, 1 == only when plugged in, 2 == always -->
<integer name="def_wifi_sleep_policy">2</integer>
<bool name="def_wifi_wakeup_enabled">true</bool>
private void checkBroadcastFromSystem(Intent intent, ProcessRecord callerApp,
String callerPackage, int callingUid, boolean isProtectedBroadcast, List receivers) {
if ((intent.getFlags() & Intent.FLAG_RECEIVER_FROM_SHELL) != 0) {
// Don't yell about broadcasts sent via shell
return;
}
。。。。。。。。。。。。。。。。。。。。
+ if(action != null && (action.contains("xxxxxxxxxxxx")
+ || action.contains("xxxxxxxxxxxxxx")
+ )){
return;
}
diff --git a/alps/frameworks/base/services/core/java/com/android/server/LocationManagerService.java b/alps/frameworks/base/services/core/java/com/android/server/LocationManagerService.jav
a
index 0b96aeb078..a186f0c316 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/LocationManagerService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/LocationManagerService.java
@@ -2642,9 +2642,9 @@ public class LocationManagerService extends ILocationManager.Stub {
LocationProvider provider = getLocationProviderLocked(name);
if (provider == null) {
/// M: [NLP check] show toast when no NLP is installed
- mHandler.post(() -> {
- mtkShowNlpNotInstalledToast(name);
- });
+ //mHandler.post(() -> {
+ // mtkShowNlpNotInstalledToast(name);
+ //});
/// M: mtk add end
throw new IllegalArgumentException("provider doesn't exist: " + name);
}
diff --git a/alps/frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/alps/frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
index 50c9a3db52..2013846b87 100644
--- a/alps/frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
+++ b/alps/frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
@@ -105,8 +105,8 @@ public class LocalBluetoothProfileManager {
///M: add for a2dp sink auto reconection because of the long distance disconnection. @{
private Timer mTimer;
private TimerTask mTimerTask;
- private static final int CONNECT_TIME_DELAY = 3000;
- private static final int MAX_CONNECT_COUNT = 20;
+ private static final int CONNECT_TIME_DELAY = 10000;
+ private static final int MAX_CONNECT_COUNT = 30;
private final int LONG_DISTANCE_DISCONNECTION = 8;
private int mConnectCount = 0;
private boolean mTimerScheduled = false;
diff --git a/alps/device/mediatek/vendor/common/audio_param/PlaybackVolDigi_AudioParam.xml b/alps/device/mediatek/vendor/common/audio_param/PlaybackVolDigi_AudioParam.xml
index 7497e26d43..d3c41e886f 100644
--- a/alps/device/mediatek/vendor/common/audio_param/PlaybackVolDigi_AudioParam.xml
+++ b/alps/device/mediatek/vendor/common/audio_param/PlaybackVolDigi_AudioParam.xml
@@ -135,7 +135,8 @@
</ParamTree>
<ParamUnitPool>
<ParamUnit param_id="0">
- <Param name="digital_gain" value="-64,-42,-39,-36,-33,-30,-27,-24,-21,-18,-15,-12,-9,-6,-3,0"/>
+ <!--<Param name="digital_gain" value="-64,-42,-39,-36,-33,-30,-27,-24,-21,-18,-15,-12,-9,-6,-3,0"/>-->
+ <Param name="digital_gain" value="-64,-42,-37,-32,-27,-22,-17,-12,-8,-4,0"/>
</ParamUnit>
</ParamUnitPool>
</AudioParam>
diff --git a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
index 01b5e11b2b..72c8979337 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
@@ -315,16 +315,16 @@ public class AudioService extends IAudioService.Stub
/// M: Modify the max stream volume @{
protected static int[] MAX_STREAM_VOLUME = new int[] {
7, // STREAM_VOICE_CALL
- 15, // STREAM_SYSTEM
- 15, // STREAM_RING
- 15, // STREAM_MUSIC
- 15, // STREAM_ALARM
- 15, // STREAM_NOTIFICATION
- 15, // STREAM_BLUETOOTH_SCO
- 15, // STREAM_SYSTEM_ENFORCED
- 15, // STREAM_DTMF
- 15, // STREAM_TTS
- 15 // STREAM_ACCESSIBILITY
+ 10, // STREAM_SYSTEM
+ 10, // STREAM_RING
+ 10, // STREAM_MUSIC
+ 10, // STREAM_ALARM
+ 10, // STREAM_NOTIFICATION
+ 10, // STREAM_BLUETOOTH_SCO
+ 10, // STREAM_SYSTEM_ENFORCED
+ 10, // STREAM_DTMF
+ 10, // STREAM_TTS
+ 10 // STREAM_ACCESSIBILITY
};
/** Minimum volume index values for audio streams */
diff --git a/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h b/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
index dbee8f2aa5..899862a15f 100644
--- a/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
+++ b/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
@@ -17,7 +17,7 @@
#define HP_IMPEDANCE_AUDIOTYPE_NAME "HpImpedance"
// VOLUME INDEX
-#define GAIN_MAX_VOL_INDEX (15) // index will change from 0~18 total 19 step
+#define GAIN_MAX_VOL_INDEX (10) // index will change from 0~18 total 19 step
#define GAIN_VOL_INDEX_SIZE (GAIN_MAX_VOL_INDEX + 1)
#define GAIN_MAX_SPEECH_VOL_INDEX (7) // for voice stream, policy index range = 0~7, set 7 here.
diff --git a/alps/system/core/init/host_init_stubs.cpp b/alps/system/core/init/host_init_stubs.cpp
index b85e54a69b..fa840ae064 100644
--- a/alps/system/core/init/host_init_stubs.cpp
+++ b/alps/system/core/init/host_init_stubs.cpp
@@ -40,7 +40,7 @@ uint32_t SetProperty(const std::string& key, const std::string& value) {
uint32_t (*property_set)(const std::string& name, const std::string& value) = SetProperty;
uint32_t HandlePropertySet(const std::string&, const std::string&, const std::string&, const ucred&,
std::string*) {
- return 0;
+ return 1;
}
// selinux.h
diff --git a/alps/system/core/init/property_service.cpp b/alps/system/core/init/property_service.cpp
index 4d853d4509..3684da48d2 100644
--- a/alps/system/core/init/property_service.cpp
+++ b/alps/system/core/init/property_service.cpp
@@ -200,10 +200,10 @@ static uint32_t PropertySet(const std::string& name, const std::string& value, s
prop_info* pi = (prop_info*) __system_property_find(name.c_str());
if (pi != nullptr) {
// ro.* properties are actually "write-once".
- if (StartsWith(name, "ro.")) {
- *error = "Read-only property was already set";
- return PROP_ERROR_READ_ONLY_PROPERTY;
- }
+ //if (StartsWith(name, "ro.")) {
+ // *error = "Read-only property was already set";
+ // return PROP_ERROR_READ_ONLY_PROPERTY;
+ //}
__system_property_update(pi, value.c_str(), valuelen);
} else {
@@ -524,9 +524,9 @@ uint32_t CheckPermissions(const std::string& name, const std::string& value,
// This returns one of the enum of PROP_SUCCESS or PROP_ERROR*.
uint32_t HandlePropertySet(const std::string& name, const std::string& value,
const std::string& source_context, const ucred& cr, std::string* error) {
- if (auto ret = CheckPermissions(name, value, source_context, cr, error); ret != PROP_SUCCESS) {
- return ret;
- }
+ //if (auto ret = CheckPermissions(name, value, source_context, cr, error); ret != PROP_SUCCESS) {
+ // return ret;
+ //}
if (StartsWith(name, "ctl.")) {
HandleControlMessage(name.c_str() + 4, value, cr.pid);
diff --git a/alps/frameworks/base/core/res/res/values/config.xml b/alps/frameworks/base/core/res/res/values/config.xml
index 76c47e4e2a..bec5417188 100644
--- a/alps/frameworks/base/core/res/res/values/config.xml
+++ b/alps/frameworks/base/core/res/res/values/config.xml
@@ -1364,7 +1364,7 @@
<bool name="config_enable_emergency_call_while_sim_locked">true</bool>
<!-- Is the lock-screen disabled for new users by default -->
- <bool name="config_disableLockscreenByDefault">false</bool>
+ <bool name="config_disableLockscreenByDefault">true</bool>
<!-- If true, enables verification of the lockscreen credential in the factory reset protection
flow. This should be true if gatekeeper / weaver credentials can still be checked after a
@@ -3730,7 +3730,7 @@
<string-array name="config_allowedSecureInstantAppSettings"></string-array>
<!-- Handle volume keys directly in Window Manager without passing them to the foreground app -->
- <bool name="config_handleVolumeKeysInWindowManager">false</bool>
+ <bool name="config_handleVolumeKeysInWindowManager">true</bool>
<!-- Volume level of in-call notification tone playback [0..1] -->
<item name="config_inCallNotificationVolume" format="float" type="dimen">.10</item>
diff --git a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
index 72c8979337..c27af037d9 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
@@ -314,17 +314,17 @@ public class AudioService extends IAudioService.Stub
/** Maximum volume index values for audio streams */
/// M: Modify the max stream volume @{
protected static int[] MAX_STREAM_VOLUME = new int[] {
- 7, // STREAM_VOICE_CALL
- 10, // STREAM_SYSTEM
- 10, // STREAM_RING
- 10, // STREAM_MUSIC
- 10, // STREAM_ALARM
- 10, // STREAM_NOTIFICATION
- 10, // STREAM_BLUETOOTH_SCO
- 10, // STREAM_SYSTEM_ENFORCED
- 10, // STREAM_DTMF
- 10, // STREAM_TTS
- 10 // STREAM_ACCESSIBILITY
+ 70, // STREAM_VOICE_CALL
+ 100, // STREAM_SYSTEM
+ 100, // STREAM_RING
+ 100, // STREAM_MUSIC
+ 100, // STREAM_ALARM
+ 100, // STREAM_NOTIFICATION
+ 100, // STREAM_BLUETOOTH_SCO
+ 100, // STREAM_SYSTEM_ENFORCED
+ 100, // STREAM_DTMF
+ 100, // STREAM_TTS
+ 100 // STREAM_ACCESSIBILITY
};
/** Minimum volume index values for audio streams */
@@ -1796,9 +1796,12 @@ public class AudioService extends IAudioService.Stub
}
} else {
// convert one UI step (+/-1) into a number of internal units on the stream alias
- step = rescaleIndex(10, streamType, streamTypeAlias);
+ //step = rescaleIndex(10, streamType, streamTypeAlias);
+ step = rescaleIndex(100, streamType, streamTypeAlias);// 调整步长,现在为100的调音 by will-zhang
}
+ if (DEBUG_VOL) Log.d(TAG, "adjustStreamVolume() step=" + step);
+
// If either the client forces allowing ringer modes for this adjustment,
// or the stream type is one that is affected by ringer modes
if (((flags & AudioManager.FLAG_ALLOW_RINGER_MODES) != 0) ||
diff --git a/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h b/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
index 899862a15f..6cc71a2381 100644
--- a/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
+++ b/alps/vendor/mediatek/proprietary/external/audio_utils/common_headers/gain_table/AudioGainTableParam.h
@@ -17,7 +17,7 @@
#define HP_IMPEDANCE_AUDIOTYPE_NAME "HpImpedance"
// VOLUME INDEX
-#define GAIN_MAX_VOL_INDEX (10) // index will change from 0~18 total 19 step
+#define GAIN_MAX_VOL_INDEX (100) // index will change from 0~18 total 19 step
#define GAIN_VOL_INDEX_SIZE (GAIN_MAX_VOL_INDEX + 1)
diff --git a/alps/external/okhttp/android/src/main/java/com/squareup/okhttp/HttpHandler.java b/alps/external/okhttp/android/src/main/java/com/squareup/okhttp/HttpHandler.java
index 6b5e26878b..07dc5e27bd 100644
--- a/alps/external/okhttp/android/src/main/java/com/squareup/okhttp/HttpHandler.java
+++ b/alps/external/okhttp/android/src/main/java/com/squareup/okhttp/HttpHandler.java
@@ -115,10 +115,10 @@ public class HttpHandler extends URLStreamHandler {
private static final class CleartextURLFilter implements URLFilter {
@Override
public void checkURLPermitted(URL url) throws IOException {
- String host = url.getHost();
- if (!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(host)) {
- throw new IOException("Cleartext HTTP traffic to " + host + " not permitted");
- }
+ //String host = url.getHost();
+ //if (!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(host)) {
+ // throw new IOException("Cleartext HTTP traffic to " + host + " not permitted");
+ //}
}
}
}
diff --git a/alps/external/okhttp/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java b/alps/external/okhttp/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
index ad8cd47050..7fd0f2e098 100644
--- a/alps/external/okhttp/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
+++ b/alps/external/okhttp/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
@@ -119,10 +119,10 @@ public class HttpHandler extends URLStreamHandler {
private static final class CleartextURLFilter implements URLFilter {
@Override
public void checkURLPermitted(URL url) throws IOException {
- String host = url.getHost();
- if (!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(host)) {
- throw new IOException("Cleartext HTTP traffic to " + host + " not permitted");
- }
+ //String host = url.getHost();
+ //if (!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(host)) {
+ // throw new IOException("Cleartext HTTP traffic to " + host + " not permitted");
+ //}
}
}
}
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index d38302d883..ebba6d7900 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -111,6 +111,15 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
mPairingDialogActivity.dismiss();
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ if(null!=mPairingController)
+ mPairingController.onDialogPositiveClick(this);
+ if(null!=mPairingDialogActivity)
+ mPairingDialogActivity.dismiss();
+ }
+
@Override
public int getMetricsCategory() {
return SettingsEnums.BLUETOOTH_DIALOG_FRAGMENT;
这里是总音量100,默认50
diff --git a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
index c27af037d9..329288a68d 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
@@ -687,12 +687,12 @@ public class AudioService extends IAudioService.Stub
(maxCallVolume * 3) / 4;
}
- int maxMusicVolume = SystemProperties.getInt("ro.config.media_vol_steps", -1);
+ int maxMusicVolume = SystemProperties.getInt("ro.config.media_vol_steps", 100);
if (maxMusicVolume != -1) {
MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = maxMusicVolume;
}
- int defaultMusicVolume = SystemProperties.getInt("ro.config.media_vol_default", -1);
+ int defaultMusicVolume = SystemProperties.getInt("ro.config.media_vol_default", 50);
if (defaultMusicVolume != -1 &&
defaultMusicVolume <= MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] &&
defaultMusicVolume >= MIN_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]) {
# 安装拦截
diff --git a/alps/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java b/alps/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
index 49844d386e..d3e5e69afb 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -17136,6 +17136,17 @@ public class PackageManagerService extends IPackageManager.Stub
request.installResult.installerPackageName = request.args.installerPackageName;
final String packageName = prepareResult.packageToScan.packageName;
+ Log.i("xunye", "packageName=="+packageName);
+ String appwhite = SystemProperties.get("ro.vendor.mediatek.clife.appwhite");
+ Slog.e("xunye", "pms appwhite == " + appwhite);
+ if (!prepareResult.system && !TextUtils.isEmpty(appwhite)) {
+ if(appwhite.contains(packageName)){
+ Slog.e("xunye", "PMS app white exist continue");
+ }else{
+ Slog.e("xunye", "PMS app white no exist return");
+ //return;
+ }
+ }
prepareResults.put(packageName, prepareResult);
installResults.put(packageName, request.installResult);
installArgs.put(packageName, request.args);