Chen Xu
27c4e658b3
remove symbols from greylist
...
telephony-common is not intended to used by any apps and
being in boot class is not updatability friendly.
We are removing telephony-common from bootclass and apply
<uses-library> in manifest instead.
for apps targeting < R will auto load telephony-common lib
for app compatibility. For apos >=R, only allow usage for
phone UID.
Bug: 135955937
Test: Build
Change-Id: Ia318661546df6d8516328886e5cc0c54d5cfafe6
2019-09-04 11:42:14 -07:00
Zimuzo Ezeozue
2c833c2b0f
Merge "Add StorageSessionController"
2019-08-29 06:07:41 +00:00
Al Sutton
55eb1a0a08
Merge changes from topic "ExtractBackupDataFromSettings"
...
* changes:
Move the list of settings to backup out of the Settings class
Move the validators out of the settings class
2019-08-29 06:04:49 +00:00
Chalard Jean
94a973b547
Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e am: 7446cd21f1
...
am: 2b85f99dcd
Change-Id: I8853562fd798e861b8d5e1c52cb7ec9da9028305
2019-08-28 22:41:23 -07:00
Chalard Jean
2b85f99dcd
Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e
...
am: 7446cd21f1
Change-Id: Ic9a3a2eac1be002fadfc45c61437d8fd8e3415f4
2019-08-28 22:29:22 -07:00
Chalard Jean
7446cd21f1
Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8
...
am: 4722a8680e
Change-Id: I028d82614006c21bcb3bc3a419d02237280e1939
2019-08-28 22:22:21 -07:00
Chalard Jean
4722a8680e
Merge "Opportunistic cleanup" am: da5685428a
...
am: 54f1300ec8
Change-Id: I675cf1f3baa3358ab0d75be7adc3fe92c9bf650d
2019-08-28 22:09:15 -07:00
Chalard Jean
54f1300ec8
Merge "Opportunistic cleanup"
...
am: da5685428a
Change-Id: I2bf98afc359e950572de052a1d460d58f704e36f
2019-08-28 21:55:24 -07:00
Chalard Jean
da5685428a
Merge "Opportunistic cleanup"
2019-08-29 04:33:44 +00:00
Andreas Gampe
c8e9459da5
[automerger skipped] Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 am: eeeac923bd am: d1ec5eb541
...
am: 040b2e80ba -s ours
am skip reason: change_id I658f31f1df299eb06fb353e8bba118470112d80b with SHA1 b60ff5bfe6 is in history
Change-Id: Ie7247a8272a12cc9692ad8d2337ae3d16e8ff717
2019-08-28 21:18:19 -07:00
Ian Kasprzak
717f846e63
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617 am: 489edfda20
...
am: 2b7053a0bd -s ours
am skip reason: subject contains skip directive
Change-Id: I0256a2e2638a3c012b33d91bbe2af76855c7f785
2019-08-28 21:07:15 -07:00
Andreas Gampe
040b2e80ba
Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 am: eeeac923bd
...
am: d1ec5eb541
Change-Id: I46d639ae44e2818ca218f1169d3ba1ad4cb07612
2019-08-28 20:37:22 -07:00
Philip P. Moltmann
525ef5d57b
Merge "Re-enable testPlatformPermissionPolicyUnaltered presubmit test"
2019-08-29 03:36:24 +00:00
Ian Kasprzak
2b7053a0bd
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617
...
am: 489edfda20
Change-Id: Iee819080ed09d2136c0f7467be770e0e5a36437f
2019-08-28 20:29:40 -07:00
Brad Ebinger
5789a6df3f
Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2 am: 7bebbb7c6e am: 9cfe7babca
...
am: 65d8b4afc7
Change-Id: I9828e5dbf228414907a7beee8f23aef5e1eb4fb5
2019-08-28 20:13:25 -07:00
Andreas Gampe
d1ec5eb541
Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8
...
am: eeeac923bd
Change-Id: Ide70bcfc61b7feb68ec25dc7090f2b4c19dc49fc
2019-08-28 20:12:22 -07:00
Ian Kasprzak
489edfda20
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours
...
am: 0cd1fdd617
Change-Id: I3833c1c3d6e4f56cdc68e44b606fcbeede4465e4
2019-08-28 20:07:48 -07:00
Jeff Sharkey
ce766b3ac7
Merge changes from topic "mappingz"
...
* changes:
Sprinkle in some TEST_MAPPING.
Fix subtle bug when using empty withValues().
2019-08-29 02:58:51 +00:00
Andreas Gampe
eeeac923bd
Merge "Framework: Clean up blacklist" into stage-aosp-master
...
am: c53172e3f8
Change-Id: I1c9a7544d7ccca85188bf09cfa6556832b1eb438
2019-08-28 19:58:01 -07:00
Ian Kasprzak
0cd1fdd617
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master
...
am: 33e559a025 -s ours
am skip reason: subject contains skip directive
Change-Id: I0b9d9a9bf90b97087743609de62b4c1d82cabcea
2019-08-28 19:52:26 -07:00
TreeHugger Robot
c53172e3f8
Merge "Framework: Clean up blacklist" into stage-aosp-master
2019-08-29 02:44:17 +00:00
TreeHugger Robot
baba1a05f5
Merge "Add ranking object to each NotificationEntry"
2019-08-29 02:41:47 +00:00
Ian Kasprzak
33e559a025
Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master
2019-08-29 02:37:04 +00:00
Kevin Hufnagle
d457ea8a0a
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 123f51ff28 am: 882828b6d6
...
am: d1b62b24cb
Change-Id: Id102d2ec1dd951c1a1a98213a9dbcb37cb3cf406
2019-08-28 19:31:52 -07:00
Kevin Hufnagle
e89f3a1779
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec am: 12ecfb5b7c
...
am: fa71485f5c
Change-Id: If5152fbc139be5ca9be934da0f1cb6a66f1ac95c
2019-08-28 19:22:33 -07:00
Brad Ebinger
65d8b4afc7
Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2 am: 7bebbb7c6e
...
am: 9cfe7babca
Change-Id: I1a3e349956d039da6af918eaecd9691ce04f234f
2019-08-28 19:13:49 -07:00
Kevin Hufnagle
d1b62b24cb
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 123f51ff28
...
am: 882828b6d6
Change-Id: Ia04cad5438ed8db470eafada9104f919408c8855
2019-08-28 18:51:34 -07:00
Kevin Hufnagle
fa71485f5c
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec
...
am: 12ecfb5b7c
Change-Id: I63779e8a5379ec85446570cd6125c4de0aa1d7f8
2019-08-28 18:39:09 -07:00
Brad Ebinger
9cfe7babca
Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2
...
am: 7bebbb7c6e
Change-Id: I16db44d88e9acf4437e2475fa5ac8ae2b64f6d1b
2019-08-28 18:34:33 -07:00
Kevin Hufnagle
3c7aa609cc
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec am: 5e1a48a660
...
am: eba15ec2b4
Change-Id: I3a599fb3e781067b76b8868d7cf3013c0e4a4fb3
2019-08-28 18:23:59 -07:00
Kevin Hufnagle
882828b6d6
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2
...
am: 123f51ff28
Change-Id: Icc89302d1aaca97b5a9a1ff795b9d5bc6811509c
2019-08-28 18:21:19 -07:00
TreeHugger Robot
6149bebf66
Merge changes from topic "drop_circular_dep"
...
* changes:
Cut the dependency to framework from droiddoc modules
Remove -without-aidls filegroups for the media apex.
2019-08-29 01:18:45 +00:00
Brad Ebinger
7bebbb7c6e
Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119
...
am: 18f96879c2
Change-Id: I8d5c580c20c274a5d1e81044596b5c1fac3bdc00
2019-08-28 18:05:20 -07:00
Kevin Hufnagle
eba15ec2b4
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec
...
am: 5e1a48a660
Change-Id: Ic65f9e1e2a51d91a08b482b3ee2e66f9f0ef29ea
2019-08-28 17:56:05 -07:00
Amit Mahajan
13b0504c4b
Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e am: 66460139d2
...
am: c0f522c3ec
Change-Id: If71c72840bcf7176fbceca91fcab9bcd81955d6b
2019-08-28 17:51:22 -07:00
Kevin Hufnagle
12ecfb5b7c
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2
...
am: 13e2b970ec
Change-Id: I09cf25fd5706e887ff1c5b9cd8b7ca6cacea04a2
2019-08-28 17:40:39 -07:00
Kevin Hufnagle
5e1a48a660
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2
...
am: 13e2b970ec
Change-Id: I393ec53ecf097e5ebe4ce2878e149fbf653df622
2019-08-28 17:39:34 -07:00
chen xu
2292c5d7d3
[automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours am: c898d8096a -s ours am: 11d9ed1c2b -s ours am: 82ab503f6c -s ours
...
am: f4d962c242 -s ours
am skip reason: change_id If03e376ad0e91ad69f8444567700ed3fe76d66f6 with SHA1 c320f2cb37 is in history
Change-Id: Idac447c10370c59cde7cf28d86aaa14de0c4a590
2019-08-28 17:35:41 -07:00
Tony Mak
1fb3554b08
Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 am: 1fdf6d4599 am: 8b8774696b am: 4b7b37eada
...
am: a955377af6
Change-Id: I9c06cb7a68636b05b4ea88725928f4166c1cff92
2019-08-28 17:33:34 -07:00
Andrew Solovay
7877e3c6d1
Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 033de4e8c2 am: 2500352d1d
...
am: 22fea3e9d3
Change-Id: Ic9b9342834fb6c1081eb2f40091bcab2f7a8cd62
2019-08-28 17:29:19 -07:00
Kevin Hufnagle
123f51ff28
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
...
am: b14d2dede2
Change-Id: Ibd55727fe3387ef7b6c6cde2e1c5ba7c2f42f34b
2019-08-28 17:21:39 -07:00
Kevin Hufnagle
13e2b970ec
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
...
am: b14d2dede2
Change-Id: Ie0f494cf950278cf1f0ed634fa5bc852852213f3
2019-08-28 17:16:27 -07:00
TreeHugger Robot
8b64d15848
Merge "Copy appop modes on write to avoid locked IO"
2019-08-29 00:15:24 +00:00
Brad Ebinger
18f96879c2
Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP"
...
am: 597234f119
Change-Id: I63b3906b26643d50d0208e4231306b9cf830e977
2019-08-28 17:12:27 -07:00
Amit Mahajan
c0f522c3ec
Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e
...
am: 66460139d2
Change-Id: Idac3364a23d0e10b5b93097eddcbbeb7718755ec
2019-08-28 17:11:44 -07:00
Philip P. Moltmann
bb7cbd38f4
Re-enable testPlatformPermissionPolicyUnaltered presubmit test
...
It was disabled when the test was renamed but the TEST_MAPPING was not
changed.
Test: atest testPlatformPermissionPolicyUnaltered
Bug: 140199041
Change-Id: I74d1bf842993b3f9c3003848a12afc811516fa17
2019-08-28 16:50:03 -07:00
Raman Tenneti
f997c75d69
[DO NOT MERGE] Disabled the following tests in TEST_MAPPING:
...
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest
Disabling in preparation for merge to aosp-master (Q release).
Test: Forrest (atest)
L55600000358896983, L81400000359164936
BUG: 139704630
BUG: 139535570
BUG: 139536812
BUG: 139535125
BUG: 139305203
Change-Id: I9be2efd464fe031a0269fa5a3913ddb4959ba05d
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests for AOSP push to Q.
2019-08-28 23:48:13 +00:00
Zim
42f1e9f731
Add StorageSessionController
...
The StorageSessionController has a StorageUserConnection to represent
the binding between the StoragemanagerService and the
ExternalStorageService for a user.
A StorageUserConnection can have multiple Sessions each representing a
mount for the user. The StorageUserConnection has an
ActiveConnection representing the active binding to the
ExternalStorageService.
If the ExternalStorageService goes down, the ActiveConnection becomes
'inactive' but the StorageManagerService will be notified to reset the
mount state of the device with the help of vold which will 're-activate'
the ActiveConnection.
This reset will among other things, kill any apps holding an open fd
on the FUSE mount and remount the FUSE mount, getting a new FUSE fd
as a result. The StorageSessionController will once again be notified
of new volume mounts and start sessions for them
Bug: 135341433
Test: adb shell setprop persist.sys.fuse && adb reboot && adb shell ls
/sdcard
Test: adb shell am crash com.android.providers.media && adb shell ls /sdcard
Change-Id: I72841a1d8012b1ca1cc88f29cb75127ea627c093
2019-08-29 00:02:52 +01:00
TreeHugger Robot
cd2dbe7d8a
Merge "Send package changed for consumers of an updated shared lib"
2019-08-28 22:50:29 +00:00
Jiyong Park
20426538f8
Cut the dependency to framework from droiddoc modules
...
droiddoc modules for the SDK API documentation and stubs library
generations have depended on the 'framework' (which was recently changed
to framework-minus-apex' module to get the list of Java source files to
be processed.
This however caused a circular dependency when we tried to modularize
some classes in the framework library as a separate library. The
separate java library depended on the stubs library (because it should
only use SDK APIs) and the stubs library depended on the framework
library. The framework library itself depended on the separated library
(or its stub) to use APIs from the separated library, thus forming a
circular dependency.
This change fixes the problem by directly giving the framework source
files via a filegroup `framework-sources-to-document` where all Java
and AIDL files that are to be documented are included in.
This change also put the generated R.java and Manifest.java files from
framework-res into the filegroup for framework sources.
Bug: 70046217
Bug: 135922046
Test: m
Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2
2019-08-29 07:44:38 +09:00