Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
752,752 Commits 3 Branches 0 Tags
079f4e576eba67a7d2dd4c1fcd44329078c35bf5
Commit Graph

752752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
079f4e576e Merge "Make testMultipleMessagesDispatched slightly less overspecified." am: b9787b1ea7 am: 8b8ff9f5f6 am: 00b739940f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030263

Change-Id: I65aeab9983d969626237dc5f0ab8aa144e45670b
 2022-03-19 02:18:00 +00:00
TreeHugger Robot
aec96b79d4 Merge "Handle price vs ctp inversion." into tm-dev 2022-03-19 02:11:56 +00:00
TreeHugger Robot
44738ca8a0 Merge "Makes GesturesObserver#clear as a private method." into tm-dev 2022-03-19 02:10:25 +00:00
Nikita Ioffe
3b5de448c2 Merge changes from topics "presubmit-am-1dec1aa04236490e8d2a03998a4272b7", "sdk-sandbox-instr" into tm-dev 
* changes:
  Add a way to instrument sdk sandbox processes
  Sdk Sandbox should be able to see it's client app
 2022-03-19 02:09:15 +00:00
Treehugger Robot
00b739940f Merge "Make testMultipleMessagesDispatched slightly less overspecified." am: b9787b1ea7 am: 8b8ff9f5f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030263

Change-Id: If9992846179a9dc3725cfb9d3443a6985460e71e
 2022-03-19 02:05:13 +00:00
Peiyong Lin
4bd3214296 Merge "Add permission for takeScreenshot API." into tm-dev 2022-03-19 01:53:16 +00:00
Treehugger Robot
8b8ff9f5f6 Merge "Make testMultipleMessagesDispatched slightly less overspecified." am: b9787b1ea7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030263

Change-Id: I812132f8f47eda30defbc743162a75e6eab64a1f
 2022-03-19 01:49:51 +00:00
Sarah Chin
7794cd47ea [automerger skipped] Merge "Moved 5G+ PCO related code to data modules" am: 917356891f am: bffbcee83b am: 633c51e2ca -s ours 
am skip reason: Merged-In I45e453b0cc497d69b85a77855d8c62b52b2e5441 with SHA-1 b5d1ea7a08 is already in history

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

Change-Id: Ie8ca154531d08f98fda954ff1b5a4d1facf4ef60
 2022-03-19 01:37:01 +00:00
John Reck
bb0809e758 Merge "Add setBuffer w/ release callback" into tm-dev 2022-03-19 01:32:25 +00:00
Treehugger Robot
b9787b1ea7 Merge "Make testMultipleMessagesDispatched slightly less overspecified." 2022-03-19 01:31:51 +00:00
Sarah Chin
633c51e2ca Merge "Moved 5G+ PCO related code to data modules" am: 917356891f am: bffbcee83b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032904

Change-Id: I218d1e63128e4503dced164a8771b35b6d52d88e
 2022-03-19 01:18:23 +00:00
Jay Sullivan
0d73e85f4c Merge "Change wording of permission API docs" into tm-dev 2022-03-19 01:11:38 +00:00
Sarah Chin
bffbcee83b Merge "Moved 5G+ PCO related code to data modules" am: 917356891f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032904

Change-Id: Ia968bf8070695f8b53a1c14960784cc7bc78c832
 2022-03-19 01:01:29 +00:00
Bill Yi
131d837990 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: eca41dd69a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a8a266129d38756440b673cdcd7da8e204ab94f
 2022-03-19 00:56:29 +00:00
Jack He
9d8b6c7b32 Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4 am: 384882aada 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: Id694d0b7240a3ffb757b9ba0f87469b97aca0dd8
 2022-03-19 00:55:12 +00:00
Sarah Chin
917356891f Merge "Moved 5G+ PCO related code to data modules" 2022-03-19 00:36:17 +00:00
Bill Yi
eca41dd69a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-19 00:35:57 +00:00
Bill Yi
f8590cbee7 Merge changes from topic "presubmit-am-25ae860cb8a042e4b04cdb86a85d5f23" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b2d9907dbe
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-19 00:35:57 +00:00
Jack He
384882aada Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: I82645039ddaa7514992d3967b9a64efc77444896
 2022-03-19 00:35:45 +00:00
TreeHugger Robot
6df18cf891 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:35:33 +00:00
TreeHugger Robot
57dc919c9c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:35:16 +00:00
TreeHugger Robot
8698e514a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:34:37 +00:00
TreeHugger Robot
b8ee3b4447 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:34:09 +00:00
TreeHugger Robot
ebbdb5df7e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:33:34 +00:00
TreeHugger Robot
bb53ddbf2e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:33:29 +00:00
TreeHugger Robot
bd83ba2994 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:32:55 +00:00
TreeHugger Robot
8677c6c302 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-19 00:32:50 +00:00
Jack He
eada5871f4 Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: I7c3758f2c46764f4f3b271ea100f175bd24daad3
 2022-03-19 00:20:40 +00:00
TreeHugger Robot
aead8e66e8 Merge "Fix race condition of lazy service binding" into tm-dev 2022-03-19 00:11:48 +00:00
TreeHugger Robot
985c39fa4f Merge "USB MIDI: Add null check on device removal" into tm-dev 2022-03-19 00:09:30 +00:00
Jack He
69e560995c Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" 2022-03-19 00:04:53 +00:00
William Loh
51f14d2581 Merge "Fix NameNotFoundException documentation" into tm-dev 2022-03-18 23:08:43 +00:00
Sarah Chin
812ecf0e27 [automerger skipped] Merge "PhysicalChannelConfig.Builder change IAE to error logs" am: 64eae25b91 am: d6917c0a0d am: d4d2170632 -s ours 
am skip reason: Merged-In I4e777e31b005b30876a72c1e2efe57b86a1ffc9b with SHA-1 9e4b6e19c2 is already in history

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

Change-Id: I0fd439e87bb61363c585acd9952f294114892b2f
 2022-03-18 23:04:48 +00:00
Mykhailo Malutin
d66d911860 Merge "Adding mapping for hubui presubmit tests" into tm-dev 2022-03-18 22:53:45 +00:00
Jack Yu
05fb389198 Moved 5G+ PCO related code to data modules 
Moved the 5G+ PCO logic from NetworkTypeController
to DataNetworkController. Also forward the PCO data to carrier
signal agent.

Fix: 214728781
Test: atest DataNetworkControllerTest DataNetworkTest
Change-Id: I45e453b0cc497d69b85a77855d8c62b52b2e5441
Merged-In: I45e453b0cc497d69b85a77855d8c62b52b2e5441
 2022-03-18 15:50:58 -07:00
Sarah Chin
d4d2170632 Merge "PhysicalChannelConfig.Builder change IAE to error logs" am: 64eae25b91 am: d6917c0a0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032085

Change-Id: I21e56bb25afbcddcf7c4d53397a09899237a0503
 2022-03-18 22:44:40 +00:00
Benedict Wong
7c3eacb6a7 Merge changes I67470903,Ia80da6d4,I332397f4 am: 7d042ad402 am: f1dacac9ea am: 639c60d696 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030266

Change-Id: Ic90ee169932a8c5db483dea4df64c9cf0129f9a4
 2022-03-18 22:32:02 +00:00
Sarah Chin
59c5044378 [automerger skipped] Merge "Handle null ApnSetting in PDCS" am: 600bc1f2ef am: 9b79ebed9b am: 871629bd60 -s ours 
am skip reason: Merged-In I7a59d1d4bc6838b5032920e3a89b984336481562 with SHA-1 87af38b1c3 is already in history

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

Change-Id: Id2aa223ae9d981084a1911cc2a3e57180102ea58
 2022-03-18 22:31:18 +00:00
Sarah Chin
d6917c0a0d Merge "PhysicalChannelConfig.Builder change IAE to error logs" am: 64eae25b91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032085

Change-Id: I2a7f4f86e4b696fc038b97aacd08d8da62f6065c
 2022-03-18 22:30:48 +00:00
Sarah Chin
fca6298c53 [automerger skipped] Merge "Update getSubscriptionPlans documentation" am: f3ecc6182b am: 969acb192a am: 925fa3fe5f -s ours 
am skip reason: Merged-In I7b232a1a695d1db7cb0d0a177bb1090e9033b805 with SHA-1 8e5d992fa4 is already in history

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

Change-Id: I2400c2b96d04db5085bd2dcf096ead35a841e8ce
 2022-03-18 22:29:21 +00:00
Sarah Chin
64eae25b91 Merge "PhysicalChannelConfig.Builder change IAE to error logs" 2022-03-18 22:17:13 +00:00
Stefan Andonian
71ad90ca9f Add an event type constant for Undismiss events when the user clicks 
Undo after dragging a predicted app icon onto the "Do Not Suggest" drop
target.

Bug: b/200841778
Test: Verified that the constant was usable from Launcher project.
Change-Id: I0f7e4f139a7b9012fd55bf72294dd8c1fab38a39
 2022-03-18 22:15:09 +00:00
Benedict Wong
639c60d696 Merge changes I67470903,Ia80da6d4,I332397f4 am: 7d042ad402 am: f1dacac9ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030266

Change-Id: Ifc90d7d64ea65ebdc996f2fbc4ce0fb90eef2f3e
 2022-03-18 22:13:01 +00:00
Sarah Chin
871629bd60 Merge "Handle null ApnSetting in PDCS" am: 600bc1f2ef am: 9b79ebed9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032086

Change-Id: I3a566cd3a6b96fe0555e393cfc381d0cd7d5a6fe
 2022-03-18 22:12:50 +00:00
Sarah Chin
925fa3fe5f Merge "Update getSubscriptionPlans documentation" am: f3ecc6182b am: 969acb192a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032283

Change-Id: I9844a808e85842c75f19a7153b56ed7dff7ec316
 2022-03-18 22:11:42 +00:00
Pablo Gamito
c6c57cdef8 Merge "Don't increment colorLayerCounter on surface migration" into tm-dev 2022-03-18 22:01:49 +00:00
Benedict Wong
f1dacac9ea Merge changes I67470903,Ia80da6d4,I332397f4 am: 7d042ad402 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030266

Change-Id: I175fb96d3f0ac485aa36675d2808c4899ef30d36
 2022-03-18 21:56:29 +00:00
Sarah Chin
9b79ebed9b Merge "Handle null ApnSetting in PDCS" am: 600bc1f2ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032086

Change-Id: Icc0d9b724cdd3790be068a015afa9c43457d4430
 2022-03-18 21:55:59 +00:00
Pinyao Ting
09f324157e Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." am: 10fc99d0b8 am: b625f5a1d5 am: d08b485739 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030444

Change-Id: I9df9bfccd9bf03de907208e4756816b200358573
 2022-03-18 21:54:45 +00:00
Sudheer Shanka
b8dcd0b86c Merge "Initialize lastUsedElapsedTime to Integer.MIN_VALUE." into tm-dev 2022-03-18 21:48:57 +00:00