Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
456,896 Commits 3 Branches 0 Tags
92f2b0da89ece755d044e30bf13925ecabaee945
Commit Graph

456896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
92f2b0da89 Merge "Make MediaController.getTag public" 2019-12-19 03:01:05 +00:00
Sungsoo Lim
46effee5ee Make MediaController.getTag public 
Bug: 146527402
Test: build
Change-Id: Iff105885aec205422d34f19fcf51340c6b6cdc71
 2019-12-19 03:00:37 +00:00
TreeHugger Robot
a563214951 Merge "Add updatable_media_stub to framework" 2019-12-19 02:49:13 +00:00
Louis Chang
ae8465d111 Merge "Remove ActivityStack#moveHomeStackToFrontIfNeeded" 2019-12-19 02:47:27 +00:00
Automerger Merge Worker
0ac7c69baf Merge "[automerger skipped] Merge "Create new Carrier configuration for separate MMTEL/RCS features" am: 8283939cec am: 8d2ebed0cb am: 29c577d086 -s ours am skip reason: Change-Id Ia16f82b9cfb9e873d2c26850dfbfd451638ad30c with SHA-1 6697814f96 is in history" 2019-12-19 02:46:38 +00:00
TreeHugger Robot
86c09b2ddc Merge changes I4af73809,Iba6a564a 
* changes:
  Hide com.android.server package with @hide javadoc tag
  Add more enums for the client and process attributes of SystemApi
 2019-12-19 02:46:17 +00:00
Automerger Merge Worker
53fc7018b2 [automerger skipped] Merge "Create new Carrier configuration for separate MMTEL/RCS features" am: 8283939cec am: 8d2ebed0cb am: 29c577d086 -s ours 
am skip reason: Change-Id Ia16f82b9cfb9e873d2c26850dfbfd451638ad30c with SHA-1 6697814f96 is in history

Change-Id: Ie9d3d4088fadf63671b2fdd440e746a75c8b8557
 2019-12-19 02:46:10 +00:00
TreeHugger Robot
51247634a8 Merge "Fixed UserManagerTest so it works on Automotive." 2019-12-19 02:45:38 +00:00
TreeHugger Robot
12eed538bd Merge "Set CarSysUI unprovisioned state depending on SUW progress." 2019-12-19 02:32:47 +00:00
Ahmed ElArabawy
64bae6b78f Merge "Wifi: Update AP Bands to include 6GHz" 2019-12-19 02:30:14 +00:00
Automerger Merge Worker
29c577d086 Merge "Create new Carrier configuration for separate MMTEL/RCS features" am: 8283939cec am: 8d2ebed0cb 
Change-Id: I71829e3233215ca50030780718bb67fc0936ea6d
 2019-12-19 02:28:18 +00:00
TreeHugger Robot
a1d5731beb Merge "Move SystemUI to /system_ext" 2019-12-19 02:17:02 +00:00
TreeHugger Robot
712a45f03e Merge "FlingAnimationUtils now takes DisplayMetrics, not Context." 2019-12-19 02:13:36 +00:00
Brad Ebinger
8d2ebed0cb Merge "Create new Carrier configuration for separate MMTEL/RCS features" 
am: 8283939cec

Change-Id: Ib876abba381b698f921111af97477f24f1fa4349
 2019-12-18 18:10:06 -08:00
Brad Ebinger
8283939cec Merge "Create new Carrier configuration for separate MMTEL/RCS features" 2019-12-19 02:02:57 +00:00
Louis Chang
074cdf2dbf Remove ActivityStack#moveHomeStackToFrontIfNeeded 
The method seems no longer necessary. The purpose of the original CL 04a0ea60
was to keep the home stack on top while allowing empty stacks existed, which
not making sense now.

And this additional code flow caused exceptions due to unexpected detached
stack access while updating focus in the middle of reparenting a task in
split-screen.


Bug: 145990447
Bug: 145972535
Test: atest ActivityLifecycleSplitScreenTests
Change-Id: I46b8b2044c851edb4e68616c8b7d38115af000e4
 2019-12-19 01:11:17 +00:00
TreeHugger Robot
848cc35375 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2019-12-19 01:05:22 +00:00
Automerger Merge Worker
9cb5cdae99 Merge "Expose ACTION_NETWORK_SET_TIME as system API" am: d3adef0662 am: 2bebf8f83b am: 63ccc52096 
Change-Id: I3d1071de60c06134d055f02d4bc759ea19a6261e
 2019-12-19 01:01:37 +00:00
Automerger Merge Worker
7cff0b252a Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev am: 8a00254d27 am: ba95108b92 
Change-Id: I123889193cc12a7ca9110464e1055e56f947a50f
 2019-12-19 01:01:08 +00:00
Automerger Merge Worker
a407b05cd8 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce91 am: 757ed29038 
Change-Id: I2b028513b6e457ad54742a6b415afa256cb1d76d
 2019-12-19 01:00:34 +00:00
Jiyong Park
5141f3790e Hide com.android.server package with @hide javadoc tag 
Metalava currently doesn't respect @Hide annoation in package statement.
Use the old @hide javadoc tag there temporarily until the problem is
fixed.

Bug: 146466118
Test: m
Test: m after adding
@SystemApi(client=MODULE_LIBRARIES,client=SYSTEM_SERVER) to some of the
classes under frameworks/base/services

Change-Id: I4af7380917fd2808bd6774b86fd4991485d6bfc6
 2019-12-19 09:49:22 +09:00
Jiyong Park
88d5e494c4 Add more enums for the client and process attributes of SystemApi 
For the client attribute, we have
- MODULE_APPS for representing APKs implementing modules which are
considered part of the platform
- MODULE_LIBRARIES for representing jars inside modules.

For the process attribute, we have
- SYSTEM_SERVER for representing the system_server process.

For example, @SystemApi(client=MODULE_LIBRARIES,process=ALL) actually
means that the API is meant to be available for classes in the
bootclasspath but not to the classes from the app classloader.

Bug: 140202860
Test: m
Change-Id: Iba6a564a0967e4d109164849ee6d6500d46469de
 2019-12-19 09:49:18 +09:00
Automerger Merge Worker
63ccc52096 Merge "Expose ACTION_NETWORK_SET_TIME as system API" am: d3adef0662 am: 2bebf8f83b 
Change-Id: I9dd2456ce684fd3c5ce3c3f4c07e7e5d96393d98
 2019-12-19 00:47:33 +00:00
Automerger Merge Worker
ba95108b92 Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev am: 8a00254d27 
Change-Id: Ieff88bbc396d67d484a217d9497f058ba946f6a1
 2019-12-19 00:43:01 +00:00
Automerger Merge Worker
757ed29038 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce91 
Change-Id: I199f8957c0df1d3efeb85cbe8e561e31045ee409
 2019-12-19 00:42:17 +00:00
Jayachandran Chinnakkannu
2bebf8f83b Merge "Expose ACTION_NETWORK_SET_TIME as system API" 
am: d3adef0662

Change-Id: Ia6408cb1afab5df22d10fcbe869cdd1999d0deaf
 2019-12-18 16:33:13 -08:00
TreeHugger Robot
8a00254d27 Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev 2019-12-19 00:25:15 +00:00
Jayachandran Chinnakkannu
d3adef0662 Merge "Expose ACTION_NETWORK_SET_TIME as system API" 2019-12-19 00:24:57 +00:00
TreeHugger Robot
a2bfc8ce91 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev 2019-12-19 00:23:29 +00:00
Abhijoy Saha
ee51369bda Set CarSysUI unprovisioned state depending on SUW progress. 
Use a controller to monitor KEY_SETUP_WIZARD_IN_PROGRESS and USER_SETUP_COMPLETE
flags to know when to set CarSysUI bars in an unprovisioned state and prevent
interactions with notification shade.

Bug: 145616123
Test: Manual
Change-Id: Ie035f049e3e9e7cb411fc9553a20e4c09078c121
 2019-12-18 16:21:55 -08:00
Automerger Merge Worker
d2d7462eb3 [automerger skipped] Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev am: 1308ffccf7 am: ad4458c2bd -s ours 
am skip reason: Change-Id I44c80a08e541503c1f910c4410fbcce3dd05a24e with SHA-1 1e713c1eab is in history

Change-Id: I66cfb67dfdb89310dbf6ef2d2e62a43905578a4f
 2019-12-19 00:02:18 +00:00
Automerger Merge Worker
ad4458c2bd Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev am: 1308ffccf7 
Change-Id: I4acb87ad99f25f0fed10f1c5dab9244713fd8fb6
 2019-12-18 23:49:12 +00:00
Walter Jang
1308ffccf7 Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev 2019-12-18 23:28:13 +00:00
Yinglei Wang
0d2e2c2be0 Merge "Fix setting state description of toggle button and switch" 2019-12-18 22:59:25 +00:00
TreeHugger Robot
a261d615dd Merge "Fix deserialization of @id aliases" 2019-12-18 22:58:06 +00:00
TreeHugger Robot
2aea1e07e2 Merge "UserSystemPackageInstaller: Implicit System Mode" 2019-12-18 22:31:43 +00:00
Dave Mankoff
45352d5e2f Merge "Use @Suppress instead of @Ignore to make atest happy." 2019-12-18 22:29:48 +00:00
TreeHugger Robot
bce6abd2b7 Merge "Fix TaskDescription's copy method" 2019-12-18 22:26:49 +00:00
Automerger Merge Worker
21b26dd979 Merge "Add post-call screen API." am: f5b6267d93 am: 1ad17b6ded am: 7e749b24bf 
Change-Id: I6ecd2f7626c2f4686a7e02347a5ffacc6aaf5817
 2019-12-18 22:03:06 +00:00
Automerger Merge Worker
48fb7f1424 Merge "Expose Circle and Polygon as SystemApi" am: ac2b27aed1 am: 66cd02ff4e am: 208fcd6196 
Change-Id: I4d33ca2e468a2a98b61400a4e3f5de08daf72e29
 2019-12-18 22:02:33 +00:00
Songchun Fan
8d76b33e85 Merge "[incremental] change temp dir" 2019-12-18 21:56:47 +00:00
TreeHugger Robot
0508340d5e Merge "AudioService: fix A2DP device check when making device unavailable" 2019-12-18 21:48:01 +00:00
Automerger Merge Worker
7e749b24bf Merge "Add post-call screen API." am: f5b6267d93 am: 1ad17b6ded 
Change-Id: Iae4072e134946cc76b0c3474e6c8856513a9c9f3
 2019-12-18 21:44:52 +00:00
Automerger Merge Worker
208fcd6196 Merge "Expose Circle and Polygon as SystemApi" am: ac2b27aed1 am: 66cd02ff4e 
Change-Id: Ibaec635c2b76e8aa8a4152841b4888830ad9e7db
 2019-12-18 21:44:19 +00:00
TreeHugger Robot
d8492dbfb2 Merge "Migrating Incremental* APIs to PackageManager APIs." 2019-12-18 21:38:46 +00:00
Mark Renouf
3095609f4e Merge "Expose snapshotTask for use in WindowManager" 2019-12-18 21:34:52 +00:00
Grace Jia
1ad17b6ded Merge "Add post-call screen API." 
am: f5b6267d93

Change-Id: I9445a99c54489706dfa560dd61a83346e3427027
 2019-12-18 13:32:53 -08:00
Jordan Liu
66cd02ff4e Merge "Expose Circle and Polygon as SystemApi" 
am: ac2b27aed1

Change-Id: I1a04dfca879c9ad978b056a8703bccebcda21f39
 2019-12-18 13:30:36 -08:00
Jean-Michel Trivi
5e851cf9d8 AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING 
Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6
 2019-12-18 13:24:16 -08:00
Grace Jia
f5b6267d93 Merge "Add post-call screen API." 2019-12-18 21:10:23 +00:00