Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
588,734 Commits 3 Branches 0 Tags
4f5acd556b153576ff4f07a67800f4db0ac71d2b
Commit Graph

588734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4f5acd556b Merge "Fix NPE of CoreSettingsObserverTest" 2020-10-23 03:28:08 +00:00
TreeHugger Robot
acd46f5672 Merge "IME API: InputConnection#getSurroudingText(int, int, int)" 2020-10-23 03:18:54 +00:00
TreeHugger Robot
1677c87944 Merge "Allow creating child surfaces from BlastBufferQueue" 2020-10-23 03:16:48 +00:00
Kurt Dresner
3971f269b0 Merge "Create empty SYSTEM_AUTOMOTIVE_PROJECTION default holder." 2020-10-23 02:57:56 +00:00
TreeHugger Robot
e7fe1a5f65 Merge "AudioManager: PendingIntent for media button is immutable" 2020-10-23 01:54:42 +00:00
Vishnu Nair
ce1a648484 Allow creating child surfaces from BlastBufferQueue 
App such as Chrome create child surfaces and parent them to
surfaces provided by SurfaceView. When we enable the blast
adapter for SurfaceView, the IGBP returned to the app is
created in the client and SurfaceFlinger does not know about it.
When the app creates a child surface and provides the IGBP as the
parent surface identifier, SF fails to validate the IGBP and the
surface is not created. This can be avoid if the client creates the
child surface from the SV SurfaceControl but we still need to
support existing APIs.

To fix this, when we create a Surface from the adapter, pass in
the handle of the Blast SurfaceControl. When calling
ASurfaceControl_createFromWindow, use this handle to identify
the parent.

Bug: 168917217
Test: adb shell settings put global use_blast_adapter_sv 1 & launch chrome
Change-Id: I879b411c47e8558397516bd7b7278813e79e005f
 2020-10-22 18:03:22 -07:00
TreeHugger Robot
da97d53cf1 Merge "Directly call 'ctl.restart' on adbd if adb is enabled" 2020-10-23 00:44:51 +00:00
Mark Renouf
19ecd2f473 Merge "Screenshots cleanup: dead code removal" 2020-10-23 00:20:08 +00:00
Jean-Michel Trivi
ec84daeea1 AudioManager: PendingIntent for media button is immutable 
Annotate PendingIntent for media button event receiver as
immutable

Bug: 170425075
Test: don't crash in december, see bug
Change-Id: I6042790fe3a154c67f448962b6ebdcc652978495
 2020-10-22 17:12:37 -07:00
TreeHugger Robot
b0411f2328 Merge "Fix NPE in revokePermissionsNoLongerImplicitLocked()." 2020-10-22 23:16:11 +00:00
Hongwei Wang
477e968c66 Merge "Add FLAG_IMMUTABLE to PendingIntent" 2020-10-22 23:07:05 +00:00
Automerger Merge Worker
30ae7a4351 [automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca03 -s ours am: 70ad24f2df -s ours am: 607f8a24c8 -s ours 
am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001ad7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I0cb8f3a8d34fb46ed5c4dd1487589b47cfdec784
 2020-10-22 22:49:22 +00:00
Hall Liu
27bb0fe614 [automerger skipped] Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd am: ebb53bbb2b am: b49b3c9484 -s ours 
am skip reason: Change-Id I14b4d527807e92fe977b8304f8dd95e7cd93e819 with SHA-1 303060c932 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: Ifa382551feb3f69ab9d914def069a74a18924572
 2020-10-22 22:48:50 +00:00
Hall Liu
f38664f476 [automerger skipped] Expose and update the call forward/waiting APIs am: 8410239d72 am: 84a9653e18 am: af7d2858e3 am: 1f96efdae1 -s ours 
am skip reason: Change-Id Ic20bc99314c8538a3f75f6af9c37bc4d30781825 with SHA-1 32634e1454 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: I180c0191b72ddd568ca1b6cfc9db1bb1f017a244
 2020-10-22 22:48:36 +00:00
Hall Liu
98ab0c074b [automerger skipped] Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 am: dacbfa7ed8 am: 2f70f9a721 -s ours 
am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001ad7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: Iaaa83a28a354247279d26713db32746dadc02cee
 2020-10-22 22:46:33 +00:00
Hall Liu
914f3a64de [automerger skipped] Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 am: 44eed5a8d9 am: c93850ce72 -s ours 
am skip reason: Change-Id I6033a84f0a0163e460343ebf603d66078455fe38 with SHA-1 df5ebc6eb9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I2d4a37dfa67eef480db0bfa6954cb25d25c2778e
 2020-10-22 22:46:27 +00:00
Hall Liu
e88f52eac6 Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 am: 6ae0e0d498 am: edcb833692 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: Ibdd11bd94cbe984a35da30f0a96020486576083a
 2020-10-22 22:45:42 +00:00
Hall Liu
2197697007 Call onOutgoingEmergencyCall only once. am: 486ef8978d am: 2c0e19cf79 am: 1e7790f927 am: a42a78e900 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I350a441e0dc10a61218e7f68cae26a5b149363e9
 2020-10-22 22:45:36 +00:00
Hall Liu
8799c25c39 [automerger skipped] Expose onEmergencyNumberListChanged, semantics change am: e182543791 am: f8e5b6fd6e am: 266e87e5a9 am: cd3ad04afd -s ours 
am skip reason: Change-Id Ia0e10bfb3376ff82d03a6dbc4bf71c22b0ace366 with SHA-1 cebecc648b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469715

Change-Id: I34af6b3835d0f8f3e085a180ae23b07f82f623eb
 2020-10-22 22:45:20 +00:00
Automerger Merge Worker
607f8a24c8 [automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca03 -s ours am: 70ad24f2df -s ours 
am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 c4587ed1c9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I63b0bf6907e375115a0cf356c2e921551a5901c5
 2020-10-22 22:24:27 +00:00
Hall Liu
b49b3c9484 Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd am: ebb53bbb2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: Ic7e3c230ab06803bd1e65c32cb925a990681d795
 2020-10-22 22:23:56 +00:00
Hall Liu
1f96efdae1 Expose and update the call forward/waiting APIs am: 8410239d72 am: 84a9653e18 am: af7d2858e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: If14ab2f08ac6c921352863daa1e90d43db7c4dbf
 2020-10-22 22:23:43 +00:00
Hall Liu
2f70f9a721 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 am: dacbfa7ed8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: Ib9a47b6400f79d50f5875d2614a487e88dd2202f
 2020-10-22 22:22:54 +00:00
Hall Liu
c93850ce72 Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 am: 44eed5a8d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I1d82f2d70704aad6705de4b74594005f7f6f25c2
 2020-10-22 22:22:48 +00:00
Hall Liu
edcb833692 Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 am: 6ae0e0d498 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: I56e32d36ca7bca36bbc4d3d5a9eeb02f3c8344b3
 2020-10-22 22:21:46 +00:00
Hall Liu
a42a78e900 Call onOutgoingEmergencyCall only once. am: 486ef8978d am: 2c0e19cf79 am: 1e7790f927 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I2feb665de8fd9186f3efcfb0832cc077f304bb63
 2020-10-22 22:21:41 +00:00
Hall Liu
cd3ad04afd Expose onEmergencyNumberListChanged, semantics change am: e182543791 am: f8e5b6fd6e am: 266e87e5a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469715

Change-Id: I68d51c9e91f3a2c08a474f7848d4fda1693c21d9
 2020-10-22 22:21:18 +00:00
Mat Bevilacqua
b9ad8213bb Merge "Migrate to PowerStats HAL 2.0" 2020-10-22 22:06:33 +00:00
Hai Zhang
aa395e04bf Fix NPE in revokePermissionsNoLongerImplicitLocked(). 
Change-Id: I5d394c709be8363be01a2c493f14b84e010aac68
Fixes: 171498627
Test: presubmit
 2020-10-22 21:54:57 +00:00
Automerger Merge Worker
70ad24f2df [automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca03 -s ours 
am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 c4587ed1c9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I44bdb6c7c62135bd8608f1a38f905ba8a79d6515
 2020-10-22 21:51:48 +00:00
Hall Liu
ebb53bbb2b Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: If5d2a4c5eaa6edead7e036f1740d0fcc752010b5
 2020-10-22 21:50:52 +00:00
Hall Liu
af7d2858e3 Expose and update the call forward/waiting APIs am: 8410239d72 am: 84a9653e18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: I97a2186c08d2cbbcc8f4111c6f7abdd60b2bf1de
 2020-10-22 21:50:49 +00:00
Hall Liu
dacbfa7ed8 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: Ida4ad72ab7b1e3d7cc34342b5bf78b91b7b5d1c3
 2020-10-22 21:49:20 +00:00
Hall Liu
44eed5a8d9 Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I968c04c3c257a487ffc4019843c9376b83f3c380
 2020-10-22 21:49:15 +00:00
Hall Liu
6ae0e0d498 Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: I993099a22efc5f2fefbf724a59f8b482abad91c7
 2020-10-22 21:48:16 +00:00
Hall Liu
1e7790f927 Call onOutgoingEmergencyCall only once. am: 486ef8978d am: 2c0e19cf79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I8821c396a8299120ee9faa2d08e9f4f1274cc97a
 2020-10-22 21:48:14 +00:00
Hall Liu
266e87e5a9 Expose onEmergencyNumberListChanged, semantics change am: e182543791 am: f8e5b6fd6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469715

Change-Id: I90f50754ce96fb39a17ff6d4b973a414ab289733
 2020-10-22 21:48:09 +00:00
Automerger Merge Worker
b7357aca03 Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master 
* changes:
  Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc
  Add new methods for setting mobile data policy am: 83bb093cc5
 2020-10-22 21:35:15 +00:00
TreeHugger Robot
283d7b9c82 Merge "Determine value metric update status" 2020-10-22 21:26:15 +00:00
Hall Liu
5abd8781fd Merge changes from topic "expose-call-forward" am: f0b822c8bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: I12392eee398fef6be867a10cf6d627a1c4b3eea8
 2020-10-22 21:26:05 +00:00
Hall Liu
2b24ea5a87 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I716a51456ab4c347294481df6cf62c7825b089c2
 2020-10-22 21:23:08 +00:00
Hall Liu
84a9653e18 Expose and update the call forward/waiting APIs am: 8410239d72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: Icd499ce501a1b418e23a550154d642a52ccb5c3d
 2020-10-22 21:22:32 +00:00
Hall Liu
04deccd68f Add new methods for setting mobile data policy am: 83bb093cc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I378bc6c1190301f996bc2048dcf1d958b469d2ec
 2020-10-22 21:19:12 +00:00
Hall Liu
4e254916f0 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I4dd5dfa39c61c04b995238f4f4dc4837871d0e58
 2020-10-22 21:16:55 +00:00
Hall Liu
f784eebb36 Add new methods for setting mobile data policy am: 83bb093cc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I86ace597ffeca7bcb0bb73b2b5ea617df80627ab
 2020-10-22 21:14:05 +00:00
Hall Liu
4c805f8ed6 Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: Id2974f5339afa48f40d9847cede33f184d12c612
 2020-10-22 21:00:47 +00:00
Hall Liu
2c0e19cf79 Call onOutgoingEmergencyCall only once. am: 486ef8978d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I3c5a098b8f22b1a032e297205684dbe4617b6e39
 2020-10-22 20:58:35 +00:00
Hall Liu
f8e5b6fd6e Expose onEmergencyNumberListChanged, semantics change am: e182543791 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469715

Change-Id: I00eef453ff044c5c5bc6878b61277c5e133b3dbe
 2020-10-22 20:53:11 +00:00
TreeHugger Robot
d248997c57 Merge "Inline WebViewUpdater into WebViewUpdateServiceImpl." 2020-10-22 20:45:46 +00:00
Jeff Sharkey
a0cdb4ca3f Merge "Migrate hot codepaths to formatSimple()." 2020-10-22 20:31:28 +00:00