Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,087 Commits 3 Branches 0 Tags
7ecff6fd01a45a9fea42a0f3ed005ba4c52bf586
Commit Graph

760087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
7ecff6fd01 Merge changes from topic "presubmit-am-fd70e1c6a633413aaa63fb8d8091e2b6" into tm-mainline-prod 
* changes:
  [automerge] [LeAudio] Add new string and an icon for the broadcast swtich dialog 2p: 4a83839989
  [LeAudio] Add new string and an icon for the broadcast swtich dialog
 2022-04-08 06:34:29 +00:00
TreeHugger Robot
c8d378df66 Merge changes from topic "presubmit-am-b01dd9a0ec884748ae6b76d4b4ae9935" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f8f5388e34
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 06:27:37 +00:00
TreeHugger Robot
75b12c4121 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3fb79a3760 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If78db03b180c8869b25184fe0ee3000e9984afa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:19:36 +00:00
TreeHugger Robot
3fb79a3760 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 06:05:05 +00:00
TreeHugger Robot
b0d51cb3e4 Merge changes from topic "presubmit-am-783b8bfb739d4097b46f70a449eed162" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c5d79bd4fb
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 06:05:04 +00:00
Bill Yi
7f1de4dcd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1ac62c27ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I136d306a1734aa9d6430d196fc7b9221af441e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 05:31:31 +00:00
Bill Yi
1ac62c27ad Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 05:09:44 +00:00
Bill Yi
5f35294f57 Merge changes from topic "presubmit-am-1ac371c403834269a544bcf0f0541c11" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2767d97be9
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 05:09:44 +00:00
Shan Huang
7c1315cc28 Merge "Create OnBackInvokedCallbackInfo to wrap callback and its priority." into tm-dev am: be460cbac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300004

Change-Id: I4387117d83d219577755dba94fcd9bc468854ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:24:34 +00:00
Shan Huang
be460cbac4 Merge "Create OnBackInvokedCallbackInfo to wrap callback and its priority." into tm-dev 2022-04-08 04:07:53 +00:00
Shan Huang
285f6a18cd Merge changes from topic "presubmit-am-9522a5e1392b4268a1792fcf81596629" into tm-mainline-prod 
* changes:
  [automerge] Create OnBackInvokedCallbackInfo to wrap callback and its priority. 2p: b353af0387
  Create OnBackInvokedCallbackInfo to wrap callback and its priority.
 2022-04-08 04:07:53 +00:00
Presubmit Automerger Backend
df84dc4d62 [automerge] [LeAudio] Add new string and an icon for the broadcast swtich dialog 2p: 4a83839989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17608149

Bug: 228415131
Change-Id: I0506a5290213a6f2729f70100e169ccdac1deb62
 2022-04-08 03:54:32 +00:00
Zoey Chen
4a83839989 [LeAudio] Add new string and an icon for the broadcast swtich dialog 
Bug: 228415131
Test: manual
Change-Id: Id8fbe22f3a23866a3c2d072664eda88c7f6d3004
 2022-04-08 03:54:08 +00:00
TreeHugger Robot
5fd65762c9 Merge "Make sure mms proxy is hostname" into tm-dev am: 1a3b4ca6f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643666

Change-Id: I927e90c34edd29f8726f84adf36b1907c504aa52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:27:55 +00:00
TreeHugger Robot
1a3b4ca6f8 Merge "Make sure mms proxy is hostname" into tm-dev 2022-04-08 03:04:25 +00:00
TreeHugger Robot
b1887b520d Merge changes from topic "presubmit-am-e2e0a85d5c2447e486904f5bd3376c69" into tm-mainline-prod 
* changes:
  [automerge] Make sure mms proxy is hostname 2p: 49dfa28259
  Make sure mms proxy is hostname
 2022-04-08 03:04:25 +00:00
Eric Biggers
81a31082a1 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0 am: 256a0b563f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Iea3e69f060b492b0973f9726951527709d840193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:20:14 +00:00
Ryan Lin
571c9e2d1a Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard" into tm-dev am: 6fcd7dd723 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17463205

Change-Id: Ibf77a5ffbb4e1b8f71e8888f5f1fbece139ea9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:11:45 +00:00
Eric Biggers
256a0b563f Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I6c0ee77edf164ecf5a285afe4dff7cec85e9d668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:11:26 +00:00
Ryan Lin
6fcd7dd723 Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard" into tm-dev 2022-04-08 01:58:45 +00:00
TreeHugger Robot
64d70d72e8 Merge "Add fields for PhoneAccountHandle without IccIds in T" into tm-dev am: fa0b6921b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17228880

Change-Id: I61472f2b41d8b303074a22755465742d958d2dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:43:17 +00:00
Aishwarya Mallampati
9ad25394fb Merge "Revert "VoWifi notification for emergency calls"" into tm-dev am: 2e894a2754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17618862

Change-Id: I965b677c8c1aaa3f6c4c0a9d2fded4195ef44f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:38:10 +00:00
TreeHugger Robot
fa0b6921b0 Merge "Add fields for PhoneAccountHandle without IccIds in T" into tm-dev 2022-04-08 01:38:07 +00:00
Shaowei Shen
6a462c23f8 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest" into tm-dev am: 27561c31f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17615603

Change-Id: I6099ece11d2a9af5a2729344a5f5ef5730eb1cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:37:49 +00:00
Vincent Wang
63c36fc6c2 Merge "Skip reset wallpaper operation if users have changed wallpaper" into tm-dev am: 2f48d97cff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17369584

Change-Id: I14d91971ce2b48c34380b1eda9d33dd6553d3510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:43 +00:00
Eric Biggers
4d4ababae0 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Ib029dddb2fd26fa33f231b7ae87c3a1fee737a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:12 +00:00
Wei Sheng Shih
472751b2a6 Merge "Prevents the binder call fail from freeze when send app visibility." into tm-dev am: 293ac013fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17464643

Change-Id: I799d34701b7f7ed11156a4398ee4b9a531a5a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:34:52 +00:00
Aishwarya Mallampati
2e894a2754 Merge "Revert "VoWifi notification for emergency calls"" into tm-dev 2022-04-08 00:46:32 +00:00
Aishwarya Mallampati
5d8e5fe5d3 Merge changes from topic "revert-17034757-VoWifi_Emergency_Notification-NYDZQSHARD" into tm-mainline-prod 
* changes:
  [automerge] Revert "VoWifi notification for emergency calls" 2p: 501b640ae0
  Revert "VoWifi notification for emergency calls"
 2022-04-08 00:46:32 +00:00
Shaowei Shen
27561c31f0 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest" into tm-dev 2022-04-08 00:44:35 +00:00
Shaowei Shen
b5a7c1d7f2 Merge changes from topic "presubmit-am-0ed6b6d049194c9aad1e4d062eecd755" into tm-mainline-prod 
* changes:
  [automerge] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest 2p: bf1a8a7f4a
  DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest
 2022-04-08 00:44:35 +00:00
Vincent Wang
2f48d97cff Merge "Skip reset wallpaper operation if users have changed wallpaper" into tm-dev 2022-04-08 00:44:02 +00:00
Wei Sheng Shih
293ac013fc Merge "Prevents the binder call fail from freeze when send app visibility." into tm-dev 2022-04-08 00:36:54 +00:00
Eric Biggers
fb4c1822a8 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I92b1cfccfc0bb657d9d5e1958c5e3e2d4ffc3794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 00:36:33 +00:00
TreeHugger Robot
9cc4f6dc89 Merge "Consolidate launch time change notifications." into tm-dev am: e9145245f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571717

Change-Id: Icda9522fe91e38f8ec331867c0a86430a0d8be6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 00:30:32 +00:00
Yuri Lin
0dca5d4b35 [automerger skipped] Merge "Add strings & channel to be used for notification to review permissions." into tm-dev am: 89a9dcc8e9 -s ours 
am skip reason: Merged-In I9743fe08cccbd8b6a9e7b367e32fe3e597b81ec4 with SHA-1 5abe07c37f is already in history

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

Change-Id: I6bfa9fa6e360389203147416628c70cec9ffe62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 00:30:14 +00:00
Mady Mellor
d53c04f8cf Merge "When calling removeTask pass mRemoveWithTaskOrganizer" into tm-dev am: 9568931521 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17529027

Change-Id: I29905b43fb4c56bbde005022dd917f5b97d9859e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 00:29:03 +00:00
TreeHugger Robot
e9145245f5 Merge "Consolidate launch time change notifications." into tm-dev 2022-04-08 00:16:38 +00:00
TreeHugger Robot
5ae2cad602 Merge changes from topic "presubmit-am-77b3b2d8d8b04e6abd7f7148c74f7ca8" into tm-mainline-prod 
* changes:
  [automerge] Consolidate launch time change notifications. 2p: 09c0ede3bf
  Consolidate launch time change notifications.
 2022-04-08 00:16:38 +00:00
Yuri Lin
89a9dcc8e9 Merge "Add strings & channel to be used for notification to review permissions." into tm-dev 2022-04-08 00:13:36 +00:00
Yuri Lin
f895d2b907 Merge changes from topic "presubmit-am-bf972dc425c64fb0857e01562822187d" into tm-mainline-prod 
* changes:
  [automerge] Add strings & channel to be used for notification to review permissions. 2p: 5abe07c37f
  Add strings & channel to be used for notification to review permissions.
 2022-04-08 00:13:36 +00:00
Eric Biggers
7e3c5382cc Merge changes Idc218e5f,I26c3fafc 
* changes:
  Remove more FDE methods from StorageManager
  Drop FDE status checks from DevicePolicyManagerService
 2022-04-08 00:09:30 +00:00
Mady Mellor
9568931521 Merge "When calling removeTask pass mRemoveWithTaskOrganizer" into tm-dev 2022-04-08 00:02:26 +00:00
Mady Mellor
583fe95b76 Merge changes from topic "presubmit-am-8978d550647a4079952ac351a4a9396f" into tm-mainline-prod 
* changes:
  [automerge] When calling removeTask pass mRemoveWithTaskOrganizer 2p: 671e62aa47
  When calling removeTask pass mRemoveWithTaskOrganizer
 2022-04-08 00:02:26 +00:00
TreeHugger Robot
cf375e75ff Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 23:55:33 +00:00
Dave Mankoff
909b59389f [automerger skipped] Merge "Remove OverviewProxyService from NavBarView." into tm-dev am: 7605f736e4 -s ours 
am skip reason: Merged-In I991edf533f53557c331d03c679319325fad31343 with SHA-1 c9abbcf8cc is already in history

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

Change-Id: Ieb1be1bdec39ba0fec8dcf30a9c43ede1bdb887e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:52:11 +00:00
TreeHugger Robot
c6b74c00d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ee70b60e8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b01b29f3dd965b6d61248d6b2df47e775c6e1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:50:07 +00:00
Dave Mankoff
7605f736e4 Merge "Remove OverviewProxyService from NavBarView." into tm-dev 2022-04-07 23:35:23 +00:00
Dave Mankoff
124f780863 Merge changes from topic "presubmit-am-d8ad062439f5423f8b432d5d90659b42" into tm-mainline-prod 
* changes:
  [automerge] Remove OverviewProxyService from NavBarView. 2p: c9abbcf8cc
  Remove OverviewProxyService from NavBarView.
 2022-04-07 23:35:23 +00:00
TreeHugger Robot
ee70b60e8a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 23:28:50 +00:00