drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
451,975 Commits 1 Branch 0 Tags
Commit Graph

451975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
75275ad59c Merge "Making install session seal+verification non blocking." 2019-11-21 02:29:34 +00:00
TreeHugger Robot
3331df77af Merge "Deprecate the use of ICU.addLikelySubtags" 2019-11-21 02:07:10 +00:00
TreeHugger Robot
4462d94b2c Merge "Add more dropbox entries to incident proto" 2019-11-21 01:42:58 +00:00
Jack Yu
b840c063ca Merge "SubscriptionManager: Cache created resources" am: f91923ff9d am: 7b76848f90 
am: d490da8eb8

Change-Id: Icf6f3564e45658fad984dc6aad0ab3e3eb306278
 2019-11-20 17:22:02 -08:00
Jack Yu
d490da8eb8 Merge "SubscriptionManager: Cache created resources" am: f91923ff9d 
am: 7b76848f90

Change-Id: I28b5c95c7de9e120194456df894d41fcaee5a416
 2019-11-20 17:18:08 -08:00
Jack Yu
7b76848f90 Merge "SubscriptionManager: Cache created resources" 
am: f91923ff9d

Change-Id: I783003109debfaac5afabf8cd977c7e4c1a39eca
 2019-11-20 17:13:46 -08:00
Jack Yu
ef25fb5ea4 [automerger skipped] Merge "telephony annotations part 2" am: 1a9f2d0e78 am: ccf305e76f 
am: 8782bfab97 -s ours
am skip reason: change_id I6de632ef7ef01a939971b7d1bacb227ec5ff4048 with SHA1 f85cf993d3 is in history

Change-Id: Iebc58a12f279068c7bfb257350fe8b81d938ca11
 2019-11-20 17:11:17 -08:00
Jack Yu
f91923ff9d Merge "SubscriptionManager: Cache created resources" 2019-11-21 01:07:33 +00:00
Jack Yu
8782bfab97 Merge "telephony annotations part 2" am: 1a9f2d0e78 
am: ccf305e76f

Change-Id: Ib08af42a04289f0cf6bc8987341afdfe02c5b7a6
 2019-11-20 17:06:27 -08:00
Evan Rosky
fd43969c28 Make stack queries multi-display aware 
Add per-display stack queries.

Bug: 144499295
Test: existing tests pass.
Change-Id: I5295c3bed7e0e5f1eae184b8b13dc518dee8c122
 2019-11-20 17:03:33 -08:00
Jack Yu
ccf305e76f Merge "telephony annotations part 2" 
am: 1a9f2d0e78

Change-Id: I99e956fc3766bbb585c7e7315142ee43de95ce23
 2019-11-20 17:02:30 -08:00
Jack Yu
1a9f2d0e78 Merge "telephony annotations part 2" 2019-11-21 00:57:13 +00:00
TreeHugger Robot
dfe69d9e2d Merge "Move UserTypeDetails & UserTypeFactory to services" 2019-11-21 00:43:29 +00:00
Mark Tabry
c68f943c1b [automerger skipped] Define new atoms for Vehicle Maps Service. am: b01c08d0a6 -s ours 
am: 3c4ba7375c -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 8a4a9989fc is in history

Change-Id: Ic1581a774f3653355a7652e283dbfb66ba346cea
 2019-11-20 16:31:25 -08:00
Mark Tabry
3c4ba7375c [automerger skipped] Define new atoms for Vehicle Maps Service. 
am: b01c08d0a6 -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 8a4a9989fc is in history

Change-Id: I346c9fdaef7c545f851d6899bee488bd1a54d72e
 2019-11-20 16:24:14 -08:00
Makoto Onuki
6b1e9d2f9f Explicitly take flags in createContextAsUser() 
Bug: 142472686
Test: atest android.content.cts.ContextTest#testCreateContextAsUser
Change-Id: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
(cherry picked from commit e5449f0b34b58e7ebe6933609d3cef78930400be)
Merged-in: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
 2019-11-20 16:20:23 -08:00
Kenny Root
4772763a78 Merge "Move RecoverySystemService into its own package" am: 9164399321 am: 53bb6db434 
am: 19953699da

Change-Id: Iaf08110d17515bca7522b04a43a7ef4795552e85
 2019-11-20 16:19:38 -08:00
Bookatz
deddeea432 Update OWNERS for some server/pm/User files 
Update to OWNERS file for the files
UserSystemPackageInstaller.java
UserTypeDetails.java
UserTypeFactory.java

Test: none
Change-Id: I593c4364d8639f09ecca1efa5f0d41c635c0f3c0
 2019-11-20 16:15:36 -08:00
Kenny Root
19953699da Merge "Move RecoverySystemService into its own package" am: 9164399321 
am: 53bb6db434

Change-Id: Id4d147684fbad83a10f730ec1464688c2b912986
 2019-11-20 16:11:46 -08:00
Kenny Root
53bb6db434 Merge "Move RecoverySystemService into its own package" 
am: 9164399321

Change-Id: Iaa931ad488b059c981646fc6684c782e47a1edf3
 2019-11-20 16:04:50 -08:00
Chen Xu
2105a42191 expose systemAPI for SmsCbLocation constructor 
Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96f3c7bf940fa8ca3b305ca9a6ca935a)
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313
 2019-11-20 15:53:02 -08:00
Mark Tabry
b01c08d0a6 Define new atoms for Vehicle Maps Service. 
Bug: 140889664
Test: N/A
Change-Id: I6bf37ed236e81fbcca50046b5a9b649685affb4a
Merged-In: I6bf37ed236e81fbcca50046b5a9b649685affb4a
(cherry picked from commit a824a64be1943945184249c7ccfa1dc1b0cdb352)
 2019-11-20 23:50:45 +00:00
Kenny Root
9164399321 Merge "Move RecoverySystemService into its own package" 2019-11-20 23:37:17 +00:00
TreeHugger Robot
979e4accd8 Merge "PullAtomMetadata for Registering Pullers" 2019-11-20 23:36:50 +00:00
Alex Buynytskyy
15a17ba20e Making install session seal+verification non blocking. 
This is moving some heavy processing e.g. apk parsing to a separate
thread and is a precondition for callback api.

Bug: b/136132412
Test: adb install wsj.apk, atest PackageManagerShellCommandTest AtomicInstallTest
Change-Id: I9d0d4d71e687b77eedbd553293ab543b29ec56f7
 2019-11-20 23:29:52 +00:00
Jay Aliomer
fea8025268 Unit tests for Override default assistant 
unit test were removed by acccident in CL https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/9764495

Test: atest NotificationManagerServiceTest
Change-Id: I6de44390c6225a68ecf58fde278733307d7f70ab
 2019-11-20 18:14:24 -05:00
Jay Aliomer
a91e08f613 Merge "Revert "Override default assistant"" 2019-11-20 23:04:09 +00:00
Preston O'Neal
8ff1f0ac8a Revert "Override default assistant" 
This reverts commit fe7f088afbfad073da04f34513d840c4ef3adf91.

Reason for revert: Seems to be causing boot failures (b/144864188)

Change-Id: I672639a1f7a41c7c4b75d21e9ff048a8691f06fb
 2019-11-20 18:00:31 -05:00
Heemin Seog
3688876ae6 [automerger skipped] Merge "DO NOT MERGE Rearrange listener logic so it can be overriden" into qt-qpr1-dev am: db4ad2afc1 
am: 20cf98f290 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib66391b43f66aced11555e74fbc62b5d64849c4f
 2019-11-20 14:54:58 -08:00
Heemin Seog
9d15b031b2 [automerger skipped] DO NOT MERGE Rearrange listener logic so it can be overriden am: 19f5398e51 
am: 6034df9e44 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc6a0b27a9ac0fe95c0eeaf4f33f5f85ef9c1383
 2019-11-20 14:51:39 -08:00
Roshan Pius
4241a2866c AndroidKeyStoreProvider: Add @throws documentation 
Bug: 144791977
Test: Compiles
Change-Id: I9f19e30d58b1b7d504f9e8f7e79dd71a38f81357
 2019-11-20 14:48:34 -08:00
Roshan Pius
866e9111c5 RemoteException: Add @throws documentation 
Bug: 144792553
Test: Compiles
Change-Id: I5a7464c2fe786b8398c5abdf43f62479de62b133
 2019-11-20 14:47:51 -08:00
Roshan Pius
a2baf58e26 Context: Rename Context.sendBroadcastMultiplePermissions 
Renaming based on API council feedback. Leaving the old API as @hide
since there are other modules in platform using the old API.

Bug: 144793100
Test: Compiles
Change-Id: Id3fd01da3b4163d186cf9651a5b2b82c18859239
 2019-11-20 14:47:43 -08:00
Heemin Seog
20cf98f290 Merge "DO NOT MERGE Rearrange listener logic so it can be overriden" into qt-qpr1-dev 
am: db4ad2afc1

Change-Id: I8286230c7db81ecc296198bfeccf80777c32f877
 2019-11-20 14:44:21 -08:00
Heemin Seog
6034df9e44 DO NOT MERGE Rearrange listener logic so it can be overriden 
am: 19f5398e51

Change-Id: I13e9c845e2f9dd70e1e5a2f13efe557609611e3a
 2019-11-20 14:44:20 -08:00
TreeHugger Robot
0371af9072 Merge "Remove unnecessary jarjar rule from framework/base" 2019-11-20 22:42:30 +00:00
Jordan Liu
337e999d5c Merge "Remove unneeded @RequiresPermission annotation" am: 0a1b47573e am: 277ea3584f 
am: ec296c8e53

Change-Id: I2e8d0718a56bcc205f3fa93244b0ee9d8b367707
 2019-11-20 14:37:17 -08:00
Jordan Liu
ec296c8e53 Merge "Remove unneeded @RequiresPermission annotation" am: 0a1b47573e 
am: 277ea3584f

Change-Id: I83c853e4512261f0c94432659a1b7a749d6fd32a
 2019-11-20 14:29:40 -08:00
Heemin Seog
db4ad2afc1 Merge "DO NOT MERGE Rearrange listener logic so it can be overriden" into qt-qpr1-dev 2019-11-20 22:27:44 +00:00
Suprabh Shukla
f7cffa7aaf Exposing WorkSource hidden APIs as system APIs 
Users of these APIs are planning to move to apex.

Test: atest FrameworksCoreTests:android.os.WorkSourceTest
atest CtsOsTestCases:android.os.cts.WorkSourceTest

Bug: 143551137
Change-Id: I2e97a8b469254ea92e3ee21571ee8ae3cbb9abbe
 2019-11-20 14:26:47 -08:00
Andrei-Valentin Onea
8d6385aaa7 [automerger skipped] Merge "Add metrics constant for platform compat UI." into stage-aosp-master am: 0c7dcba3e2 -s ours 
am: 665585fe4a -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 1380a56438 is in history

Change-Id: I58ac2ad55104fe6df2609adb60904c769616008d
 2019-11-20 14:26:05 -08:00
Jordan Liu
277ea3584f Merge "Remove unneeded @RequiresPermission annotation" 
am: 0a1b47573e

Change-Id: I47d83e0d224cb9840b326212f84c83a8e16c1a85
 2019-11-20 14:22:03 -08:00
Android Build Merger (Role)
bef173a836 Merge "[automerger skipped] Merge "Add Context.createContextAsUser()" am: 63d5e4a0b9 am: 056b8f00b7 am: 2dfdf1a4cf -s ours am skip reason: change_id Id640e03862462724df1a4a3101f0b08faafba22f with SHA1 b844001d6a is in history" 2019-11-20 22:18:43 +00:00
Makoto Onuki
0f94e4605c [automerger skipped] Merge "Add Context.createContextAsUser()" am: 63d5e4a0b9 am: 056b8f00b7 
am: 2dfdf1a4cf -s ours
am skip reason: change_id Id640e03862462724df1a4a3101f0b08faafba22f with SHA1 b844001d6a is in history

Change-Id: I6a95d2fdbddb2f9269d460665c431286718eb178
 2019-11-20 14:18:14 -08:00
Andrei-Valentin Onea
665585fe4a [automerger skipped] Merge "Add metrics constant for platform compat UI." into stage-aosp-master 
am: 0c7dcba3e2 -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 053191eae2 is in history

Change-Id: I488a9f72b32ead5dbe69c336e108edd6379aa22a
 2019-11-20 14:18:09 -08:00
TreeHugger Robot
d29bd9b524 Merge "More precise argument name in isGuestUser" 2019-11-20 22:17:36 +00:00
Makoto Onuki
2dfdf1a4cf Merge "Add Context.createContextAsUser()" am: 63d5e4a0b9 
am: 056b8f00b7

Change-Id: I703b0234c75f91ad548a0c431277d684212e0586
 2019-11-20 14:11:19 -08:00
Chen Xu
b6d1319d1a telephony annotations part 2 
adding missing annotations

Bug: 140908357
Test: Build

Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d38462a45a7c4c4ab623742a13a7c4e8)
 2019-11-20 14:09:16 -08:00
Andrei-Valentin Onea
0c7dcba3e2 Merge "Add metrics constant for platform compat UI." into stage-aosp-master 2019-11-20 22:06:30 +00:00
Jordan Liu
0a1b47573e Merge "Remove unneeded @RequiresPermission annotation" 2019-11-20 22:04:20 +00:00