OSDN Git Service
Andrei-Valentin Onea [Fri, 8 Mar 2019 13:56:53 +0000 (05:56 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
5d256870aa
Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a
Siarhei Vishniakou [Fri, 8 Mar 2019 13:53:28 +0000 (05:53 -0800)]
Merge "Add a null check for getWindow()"
am:
3c69948e6a
Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
Andrei Onea [Fri, 8 Mar 2019 12:34:28 +0000 (12:34 +0000)]
resolve merge conflicts of
04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
Android Build Merger (Role) [Thu, 7 Mar 2019 19:19:39 +0000 (19:19 +0000)]
Merge "Merge "Add @UnsupportedAppUsage annotations" am:
315404a9a5" into stage-aosp-master
Andrei-Valentin Onea [Thu, 7 Mar 2019 19:18:44 +0000 (11:18 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
315404a9a5
Change-Id: Ic6969243ca77124ff2063359c341969d01eeb7d9
Andrei-Valentin Onea [Thu, 7 Mar 2019 19:10:22 +0000 (11:10 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
315404a9a5
Change-Id: I281b0d628f1201e88d4c7c3a764f5a55392dadaa
Andrei-Valentin Onea [Thu, 7 Mar 2019 17:26:09 +0000 (17:26 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 7 Mar 2019 17:02:00 +0000 (17:02 +0000)]
Merge "Add a null check for getWindow()"
Andrei-Valentin Onea [Thu, 7 Mar 2019 16:31:14 +0000 (16:31 +0000)]
Merge "Add target for generating aidl mappings"
Andrei-Valentin Onea [Thu, 7 Mar 2019 16:30:32 +0000 (16:30 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Leo Hsu [Thu, 7 Mar 2019 13:56:52 +0000 (05:56 -0800)]
Merge "Exclude Emergency Dialer from recent app list."
am:
108b8d6e40
Change-Id: I2c91bdea23f77be5e0e7e09d6b7c888bc1755e46
Treehugger Robot [Thu, 7 Mar 2019 13:43:36 +0000 (13:43 +0000)]
Merge "Exclude Emergency Dialer from recent app list."
Mark Chien [Thu, 7 Mar 2019 13:32:33 +0000 (05:32 -0800)]
Merge "Fix TetheringEntitlementValueListener related API"
am:
fbcc63d51f
Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
Mark Chien [Thu, 7 Mar 2019 13:21:53 +0000 (13:21 +0000)]
Merge "Fix TetheringEntitlementValueListener related API"
Leo Hsu [Wed, 6 Mar 2019 07:25:28 +0000 (15:25 +0800)]
Exclude Emergency Dialer from recent app list.
Emergency Dialer should not show up in recent app list.
Bug:
112168722
Bug:
127585929
Test: Long press power key, tap Emergency, quit Emergency Dialer, and
check recent app list.
Change-Id: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Merged-In: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Andrei-Valentin Onea [Thu, 7 Mar 2019 10:32:26 +0000 (02:32 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
722dff1f35
Change-Id: I559e8abb355a41119d9cd86a497fbdbd69157f9b
Andrei-Valentin Onea [Thu, 7 Mar 2019 10:20:28 +0000 (10:20 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Chad Brubaker [Thu, 7 Mar 2019 09:10:53 +0000 (01:10 -0800)]
Merge "Do not call noteOp if checkPermission fails"
am:
bc9b1b6f94
Change-Id: I53347c7a897b079268d9c8af704664a832eae581
Treehugger Robot [Thu, 7 Mar 2019 08:56:39 +0000 (08:56 +0000)]
Merge "Do not call noteOp if checkPermission fails"
Brett Chabot [Thu, 7 Mar 2019 05:51:50 +0000 (21:51 -0800)]
Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am:
58038da960
Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
Treehugger Robot [Thu, 7 Mar 2019 05:42:07 +0000 (05:42 +0000)]
Merge "Migrate frameworks/base/tests/net/ to androidx.test"
markchien [Wed, 6 Mar 2019 08:25:00 +0000 (16:25 +0800)]
Fix TetheringEntitlementValueListener related API
Test: -build, flash, boot
-atest FrameworksNetTests
bug:
126701557
bug:
126392011
Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
Remi NGUYEN VAN [Thu, 7 Mar 2019 04:13:28 +0000 (20:13 -0800)]
Merge "Fix SocketUtils API"
am:
3da7809ae4
Change-Id: I03e0eb60d71cba27e57f8ee7832269bbd75f5344
Remi NGUYEN VAN [Thu, 7 Mar 2019 03:54:22 +0000 (03:54 +0000)]
Merge "Fix SocketUtils API"
Josh Hou [Thu, 7 Mar 2019 01:32:50 +0000 (17:32 -0800)]
Merge "add NonNull annotation to API"
am:
fd2bb72030
Change-Id: Idf5a7df74815a9e339cf4313506f269ddbdce5d1
Treehugger Robot [Thu, 7 Mar 2019 01:07:34 +0000 (01:07 +0000)]
Merge "add NonNull annotation to API"
Hall Liu [Thu, 7 Mar 2019 00:33:02 +0000 (16:33 -0800)]
Merge "API tweaks"
am:
f3fbbeaa05
Change-Id: I3d45d13a482125edd91ec86e5c297f9fdb976072
Hall Liu [Thu, 7 Mar 2019 00:11:31 +0000 (00:11 +0000)]
Merge "API tweaks"
Jordan Liu [Wed, 6 Mar 2019 23:44:19 +0000 (15:44 -0800)]
Merge "Reset callNetworkType and CallQuality after calls"
am:
5819a3378d
Change-Id: Ie7a8141b002693946967eb4b0d70fae299be03bc
Treehugger Robot [Wed, 6 Mar 2019 23:28:33 +0000 (23:28 +0000)]
Merge "Reset callNetworkType and CallQuality after calls"
Brad Ebinger [Wed, 6 Mar 2019 23:04:11 +0000 (15:04 -0800)]
Merge "Add Nullable/NonNull Annotations where appropriate."
am:
eb4d20673f
Change-Id: Idc4e4d59c4773832111ff4383b1aa494d539f2d9
Brad Ebinger [Wed, 6 Mar 2019 22:47:58 +0000 (22:47 +0000)]
Merge "Add Nullable/NonNull Annotations where appropriate."
Pengquan Meng [Wed, 6 Mar 2019 22:32:03 +0000 (14:32 -0800)]
Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
am:
8273d66ebc
Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d
Nathan Harold [Wed, 6 Mar 2019 21:54:50 +0000 (13:54 -0800)]
Merge "Move Annotations for getCellSignalStrengths"
am:
5ba92cf940
Change-Id: I6b91cdd94c5367ec4f89b7959d746faae10df1ef
Pengquan Meng [Wed, 6 Mar 2019 21:52:32 +0000 (21:52 +0000)]
Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
Pengquan Meng [Wed, 6 Mar 2019 21:46:02 +0000 (13:46 -0800)]
Merge "Add carrier config for 5G Icon"
am:
2aee6901fb
Change-Id: Iec2c01555d1200f707ee41f23d7ef75799d678f7
Chad Brubaker [Wed, 6 Mar 2019 00:40:33 +0000 (16:40 -0800)]
Do not call noteOp if checkPermission fails
This causes an access to be logged for runtime permissions even if the
permission is denied, which is incorrect.
Fixes:
127297477
Bug:
116258458
Test: Verified using steps in b/
127297477
Change-Id: I8306aa273b7d4dfab40a2a6d8d1ef6f4d8cc2c54
Nathan Harold [Wed, 6 Mar 2019 21:41:18 +0000 (21:41 +0000)]
Merge "Move Annotations for getCellSignalStrengths"
Pengquan Meng [Wed, 6 Mar 2019 21:36:46 +0000 (21:36 +0000)]
Merge "Add carrier config for 5G Icon"
Felipe Leme [Wed, 6 Mar 2019 21:00:38 +0000 (13:00 -0800)]
Merge "Added secondary owners on per-file entries."
am:
6d80c7a6e4
Change-Id: I64bd54a36864d957e30c2920698dea03717c6a0d
Treehugger Robot [Wed, 6 Mar 2019 20:51:42 +0000 (20:51 +0000)]
Merge "Added secondary owners on per-file entries."
Steven Moreland [Wed, 6 Mar 2019 20:28:23 +0000 (12:28 -0800)]
Merge "NativeHandle.java: set Nullable/NonNull"
am:
6792c595a2
Change-Id: I09cdb1ce3cc64cb8ca42a13b307b93b5dab8e42c
Steven Moreland [Wed, 6 Mar 2019 20:02:57 +0000 (20:02 +0000)]
Merge "NativeHandle.java: set Nullable/NonNull"
Hall Liu [Wed, 27 Feb 2019 01:58:53 +0000 (17:58 -0800)]
API tweaks
* Make the PhoneAccountSuggestion ctor public
* Change protection level of the bind-suggestion-service permission to
signature-only.
Fixes:
126442573
Fixes:
126442403
Test: CTS
Change-Id: Ic6d44989efd28420a5e9e7e9c365318538d140bb
Nazanin Bakhshi [Wed, 6 Mar 2019 19:24:04 +0000 (11:24 -0800)]
Merge "disallow changing from multi-sim to single-sim for carrier apps"
am:
27c8f495f2
Change-Id: Iec876a398bec6fa2c61b633d7ba8e999e4742964
Nathan Harold [Wed, 6 Mar 2019 19:10:40 +0000 (11:10 -0800)]
Move Annotations for getCellSignalStrengths
As per API council script's feedback, the scripts
do not support having nullable annotations preceding
the return tupe. Moving the @NonNull annotations to a
script friendly location.
Bug:
126700393
Test: make update-api && make
&& make offline-sdk-docs (no functional change)
Change-Id: Ie063ffa2e311f4eb7d9e07cd5ee212af97d9d45d
Pengquan Meng [Thu, 6 Dec 2018 00:26:42 +0000 (16:26 -0800)]
Add carrier config for 5G Icon
Bug:
111453000
Test: build
Merged-In: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Nazanin Bakhshi [Wed, 6 Mar 2019 19:10:58 +0000 (19:10 +0000)]
Merge "disallow changing from multi-sim to single-sim for carrier apps"
Siarhei Vishniakou [Tue, 5 Mar 2019 18:05:01 +0000 (10:05 -0800)]
Add a null check for getWindow()
Protect against crash surfaced by monkey, where it seems that the window
of the dialog is no longer present. If not present, don't need to post
dismiss runnable.
Bug:
124327419
Test: adb shell monkey -p com.google.android.GoogleCamera -s 999 -v 20000
Change-Id: Ic03b8501bb73725e04544fcb2397532be531988e
Andrei-Valentin Onea [Wed, 6 Mar 2019 18:30:15 +0000 (10:30 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
f304f4d2ea
Change-Id: Ic5e5148c473e64bc5d8ff506e7f4ac78c409734c
Andrei-Valentin Onea [Wed, 6 Mar 2019 18:01:47 +0000 (18:01 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:46:00 +0000 (09:46 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
842e3aa420
Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:41:34 +0000 (09:41 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
cf03906edc
Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:37:26 +0000 (09:37 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
8cbc2e9ad1
Change-Id: I83a19c3b85546749e360ef979e8e6eeac09e29ea
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:19:05 +0000 (17:19 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:18:05 +0000 (17:18 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Steven Moreland [Tue, 5 Mar 2019 01:56:30 +0000 (17:56 -0800)]
NativeHandle.java: set Nullable/NonNull
Fixes:
126700972
Test: hidl_test_java
Test: atest android.os.cts.HwBinderTest
Change-Id: Id45c6d0757913014028f7629db78b64f27cad084
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:17:27 +0000 (17:17 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Felipe Leme [Wed, 6 Mar 2019 17:10:27 +0000 (09:10 -0800)]
Added secondary owners on per-file entries.
Test: none
Bug:
126945732
Change-Id: I4b9786c9b01993f230f962a54e08127684b3289e
Andrei Onea [Wed, 6 Mar 2019 15:17:47 +0000 (15:17 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.accounts
android.app
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25
Change-Id: I47b5f45ced1c6e385ed24424e442c76fc0487af7
Andrei Onea [Wed, 6 Mar 2019 15:41:14 +0000 (15:41 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.speech
android.telephony.mbms.vendor
android.view
android.webkit
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10
Change-Id: I04104cf3852a0a7440676ccc55dd96c1eec730c4
Adrian Roos [Wed, 6 Mar 2019 12:57:33 +0000 (04:57 -0800)]
Merge "apilint: Lint unhidden @IntDef and @LongDef"
am:
4435924104
Change-Id: I7d12ed9f2ac7fcdc6490a7fcd2e5c99a21fe7110
Adrian Roos [Wed, 6 Mar 2019 12:43:55 +0000 (12:43 +0000)]
Merge "apilint: Lint unhidden @IntDef and @LongDef"
Adrian Roos [Wed, 6 Mar 2019 12:38:10 +0000 (13:38 +0100)]
apilint: Lint unhidden @IntDef and @LongDef
@IntDefs and @LongDefs cannot be stored in a .class file, because the constant
names are lost. Instead, they are packaged out-of-band.
Therefore, they should never be in the API.
Test: python tools/apilint/apilint.py api/current.txt
Change-Id: If22e0cf7db0bb90dae6174bf546f2ec8be4e5458
Sundong Ahn [Wed, 6 Mar 2019 11:57:49 +0000 (03:57 -0800)]
Merge "Add permission and permission.xsd"
am:
e5d100518d
Change-Id: I2bfa1ae166ac8cba7a2668f69a355203b41e2570
Treehugger Robot [Wed, 6 Mar 2019 11:49:03 +0000 (11:49 +0000)]
Merge "Add permission and permission.xsd"
Sundong Ahn [Wed, 6 Mar 2019 10:16:36 +0000 (02:16 -0800)]
Merge "Add default-permissions"
am:
d05e13d0a4
Change-Id: If359ee759e26b7b065060768db9f591d856f213b
Sundong Ahn [Wed, 6 Mar 2019 10:04:12 +0000 (10:04 +0000)]
Merge "Add default-permissions"
Wei Sheng Shih [Wed, 6 Mar 2019 09:44:14 +0000 (01:44 -0800)]
Merge "Revert "API tweaks""
am:
c61bb461b6
Change-Id: I8b9729b9afe1798b84193a4ce09777372585fc27
Wei Sheng Shih [Wed, 6 Mar 2019 09:32:11 +0000 (09:32 +0000)]
Merge "Revert "API tweaks""
Wei Sheng Shih [Wed, 6 Mar 2019 09:15:17 +0000 (09:15 +0000)]
Revert "API tweaks"
This reverts commit
f3e0eb8b0c9e334138b0e663dfb498e34144877b.
Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered
Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
Remi NGUYEN VAN [Wed, 6 Mar 2019 09:02:34 +0000 (18:02 +0900)]
Fix SocketUtils API
- connect, sendTo, bind were added as public API, so do not need to be
maintained as SystemApi in SocketUtils. These APIs were added in Q
timeframe.
- Add @Nullable/@NonNull annotations.
Bug:
126699304
Bug:
126477266
Test: booted, WiFi works
Change-Id: I3f086ac8952cfd6a4d8f861d2e1c7aa1ca8be999
Sundong Ahn [Thu, 3 Jan 2019 02:52:04 +0000 (11:52 +0900)]
Add permission and permission.xsd
This module is for API check of java file generated from
permission.xsd
Bug:
80453829
Test: m -j
Change-Id: Ie70693400a6c9b261c8b1ca6197206ac3d17a271
Sundong Ahn [Thu, 3 Jan 2019 08:37:10 +0000 (17:37 +0900)]
Add default-permissions
This module is for API check of java file generated from
default-permissions.xsd
Bug:
80453829
Test: m -j
Change-Id: Ic2d6b9a64ceb19711ce6f3fb2da0f1f01d17ebc5
Chen Xu [Wed, 6 Mar 2019 05:07:04 +0000 (21:07 -0800)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
am:
76b53f0948
Change-Id: I6dce9a020c6131cbcc2a55af7e3c8be826a5b9c1
Chen Xu [Wed, 6 Mar 2019 04:58:36 +0000 (04:58 +0000)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
Chen Xu [Wed, 6 Mar 2019 03:19:43 +0000 (19:19 -0800)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
am:
e5fd14aed5
Change-Id: Ic84ed20f676363b5c3cbfd82c25d18027f4b1267
Chen Xu [Wed, 6 Mar 2019 02:50:20 +0000 (02:50 +0000)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
Chiachang Wang [Wed, 6 Mar 2019 01:23:24 +0000 (17:23 -0800)]
Merge "Update description based on API feedback"
am:
f397b39442
Change-Id: I4abb8d87ecd681105a059b264b3c4808fce535bc
chen xu [Sat, 9 Feb 2019 01:40:33 +0000 (17:40 -0800)]
migrate cdma home eri from resource overlay to carrierconfig
Bug:
121145488
Test: Build
Change-Id: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
(cherry picked from commit
eb07e4ebff8c53f1e183b3de8499c5b0bf92c1f9)
Merged-in: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
Chiachang Wang [Wed, 6 Mar 2019 00:49:20 +0000 (00:49 +0000)]
Merge "Update description based on API feedback"
Nazanin Bakhshi [Wed, 6 Mar 2019 00:27:30 +0000 (16:27 -0800)]
Merge "create getModemEnabled function in PhoneConfigurationManager"
am:
8bf13f06d7
Change-Id: I7aa5f7b4c3d7ff28911ba2abf3bfe5666da09082
Satoshi Sanno [Wed, 6 Mar 2019 00:22:58 +0000 (16:22 -0800)]
Merge "Fix that the update to v1 signed version fails if apk verity is enabled"
am:
0b3fe647ef
Change-Id: If94e803f747e160a406bb3a80b583bc8c8d4af87
Jack Yu [Wed, 6 Mar 2019 00:15:36 +0000 (16:15 -0800)]
Merge changes from topic "iwlan_api"
am:
83181d80c8
Change-Id: Ia232ee5c9cf4e6393ba093cc7a3723d71bc34af0
Hall Liu [Tue, 5 Mar 2019 23:54:02 +0000 (15:54 -0800)]
Merge "API tweaks"
am:
13152049e9
Change-Id: I7339a8e77cea9bea236977f8a5df39c28feadaa5
Chen Xu [Tue, 5 Mar 2019 23:41:11 +0000 (15:41 -0800)]
Merge "fix the issue that sending wrong preferred networktype to RIL"
am:
695bbd1858
Change-Id: I25367a464940eed11028d98f27aa9dd9a1258bbc
Brad Ebinger [Thu, 28 Feb 2019 21:10:32 +0000 (13:10 -0800)]
Add Nullable/NonNull Annotations where appropriate.
Bug:
126701249
Bug:
126701136
Bug:
126701236
Bug:
126700627
Bug:
126702224
Test: atest FrameworksTelephonyTests
Merged-In: I4cfba9dee766fa9d34f578db4143919c3f203a20
Change-Id: I4cfba9dee766fa9d34f578db4143919c3f203a20
chen xu [Tue, 5 Mar 2019 23:33:18 +0000 (15:33 -0800)]
Merge "add missing annotation for CarrierIdentifier"
am:
fd46a0aaeb
Change-Id: Ifbee0be758972174191967de245523e003790fb1
chen xu [Tue, 5 Mar 2019 23:29:41 +0000 (15:29 -0800)]
Merge "add missing annotation for TelephonyManager APIs"
am:
792ce880ad
Change-Id: Ieb46456932dae085d7d2a4756619902047db40de
Chuwei Xu [Tue, 5 Mar 2019 23:26:13 +0000 (15:26 -0800)]
Merge "WIFI cannot be automatically connected"
am:
02586ec5ab
Change-Id: I6d2cd417e8f85e1e2dbcb324ea31ffacd50a2f7d
Adrian Roos [Tue, 5 Mar 2019 23:22:53 +0000 (15:22 -0800)]
Merge "Apilint: No longer flag interface callbacks"
am:
26968d81f8
Change-Id: I5754aa7c70d583e88b7837a61aa998678843c118
Adrian Roos [Tue, 5 Mar 2019 23:19:22 +0000 (15:19 -0800)]
Merge "apilint: decorator-based verifier registration"
am:
6e16eb107d
Change-Id: I4eba036308797fcf892264aab6e70f7b8acf8ffc
Adrian Roos [Tue, 5 Mar 2019 23:15:39 +0000 (15:15 -0800)]
Merge "Apilint: lint for URL/URI"
am:
1d50b63cee
Change-Id: I4c1845769e82d3bae55678480372dcde69153b02
Suren Baghdasaryan [Tue, 5 Mar 2019 23:10:43 +0000 (15:10 -0800)]
Merge "Add min_score_adj into LmkKillOccurred event"
am:
927b3dcb53
Change-Id: I6b93652b9832b02a61e421eefd6e2b38657495ee
chen xu [Thu, 28 Feb 2019 21:50:23 +0000 (13:50 -0800)]
migrate cdma home eri from resource overlay to carrierconfig
remove config from resource overlay
Bug:
121145488
Test: Manual
Change-Id: Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1
(cherry picked from commit
4933ef2310a45a5d24b1f1cd2533382c5e96487f)
Merged-in: Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1
Nazanin Bakhshi [Fri, 1 Mar 2019 19:54:41 +0000 (11:54 -0800)]
disallow changing from multi-sim to single-sim for carrier apps
Bug:
125122645
Test: build
Change-Id: Ie422577e1f710b033ed85caed9a3e864aadff061
Merged-In: Ie422577e1f710b033ed85caed9a3e864aadff061
(cherry picked from commit
36ede9a2e66a83464590e8998ebdd4bc6feaf240)
Nazanin Bakhshi [Tue, 5 Mar 2019 22:07:17 +0000 (22:07 +0000)]
Merge "create getModemEnabled function in PhoneConfigurationManager"
Treehugger Robot [Tue, 5 Mar 2019 21:33:25 +0000 (21:33 +0000)]
Merge "Fix that the update to v1 signed version fails if apk verity is enabled"
Jack Yu [Tue, 5 Mar 2019 21:26:30 +0000 (21:26 +0000)]
Merge changes from topic "iwlan_api"
* changes:
Added annotations to the APIs
Fixed IWLAN related APIs issue
Hall Liu [Tue, 5 Mar 2019 21:18:40 +0000 (21:18 +0000)]
Merge "API tweaks"