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

760146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cliff Wu
fe10554c1d Merge "Update the strings on app unavailable alert dialog" into tm-dev am: bd29171215 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17473284

Change-Id: I45950439bf16c4d3f83b13a52ba33c05d9650847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 15:50:56 +00:00
Hui Yu
c2f808997b Merge "BroadcastRecord's receivers could be null." into tm-dev am: ccfcc3be92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17647259

Change-Id: I74b4172dcf7ab4eae53cea01fcdde4b3d84df8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 15:50:36 +00:00
Cliff Wu
bd29171215 Merge "Update the strings on app unavailable alert dialog" into tm-dev 2022-04-08 15:48:52 +00:00
Hui Yu
c97bf5e5c0 Merge changes from topic "presubmit-am-b3cb1be8a230487d8bec0d1ac2f63c12" into tm-mainline-prod 
* changes:
  [automerge] BroadcastRecord's receivers could be null. 2p: 505838ed0b
  BroadcastRecord's receivers could be null.
 2022-04-08 15:47:51 +00:00
Hui Yu
ccfcc3be92 Merge "BroadcastRecord's receivers could be null." into tm-dev 2022-04-08 15:47:51 +00:00
Prabir Pradhan
592949bb4e Merge "Instrumentation: Wait for finish when injecting pointer events" into tm-dev am: 4b2317aa29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17654828

Change-Id: Id2afb1710d5bc79e1e2a16b86b63b456670f5e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 15:43:29 +00:00
Prabir Pradhan
4b2317aa29 Merge "Instrumentation: Wait for finish when injecting pointer events" into tm-dev 2022-04-08 15:28:21 +00:00
Prabir Pradhan
7c1dccf103 Merge changes from topic "presubmit-am-0dc44efdc89c4009b75e40a2ea6e9bc4" into tm-mainline-prod 
* changes:
  [automerge] Instrumentation: Wait for finish when injecting pointer events 2p: 8e03ce9a9d
  Instrumentation: Wait for finish when injecting pointer events
 2022-04-08 15:28:21 +00:00
Hui Wang
f15752c829 Merge "Do not cache the resource if the active sub info is null" into tm-dev am: 3fda2bf279 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206595

Change-Id: I6df8fcbd8d4f1e8ae3d6180039f4e0f25a0b81ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:19:19 +00:00
Hui Wang
3fda2bf279 Merge "Do not cache the resource if the active sub info is null" into tm-dev 2022-04-08 14:03:26 +00:00
Presubmit Automerger Backend
5e82022d18 [automerge] Instrumentation: Wait for finish when injecting pointer events 2p: 8e03ce9a9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17654828

Bug: 228203157
Bug: 228201593
Change-Id: Ib76a43b23df1418413d7c50f555073206a9843f3
 2022-04-08 13:06:10 +00:00
Prabir Pradhan
8e03ce9a9d Instrumentation: Wait for finish when injecting pointer events 
The input injection mode for pointer events in sendPointerSync() was
accidentally changed to WAIT_FOR_RESULT instead of WAIT_FOR_FINISH in
ag/17506923, causing test failures. Change it back to WAIT_FOR_FINISH.

Bug: 228203157
Bug: 228201593
Test: atest HoverTest
Change-Id: I2d3a77621290509d5be6279ee450e1881bd9d84d
 2022-04-08 13:05:12 +00:00
Kriti Dang
92cc1cb33c Merge "Changing the name densityMap->densityMapping due to framework changes" into tm-dev am: 012dcb8b1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17617007

Change-Id: I1ce52831c264971098ef078ec224a492a661884c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:44:36 +00:00
Kriti Dang
012dcb8b1a Merge "Changing the name densityMap->densityMapping due to framework changes" into tm-dev 2022-04-08 12:31:26 +00:00
Kriti Dang
55fbc1411c Merge changes from topic "presubmit-am-ac759ede893c416ea62c4d5bc087973f" into tm-mainline-prod 
* changes:
  [automerge] Changing the name densityMap->densityMapping due to framework changes 2p: 226a5e3b66
  Changing the name densityMap->densityMapping due to framework changes
 2022-04-08 12:31:25 +00:00
Josh Hou
ba0386f66c Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: 16b3ddf421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630328

Change-Id: I3031a58d3babb5400f64b607a7a0eacd1fb99adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:22:26 +00:00
Josh Hou
16b3ddf421 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev 2022-04-08 11:32:21 +00:00
Josh Hou
7c46effbd4 Merge changes from topic "screen_title" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Screen title is displayed incorrectly 2p: db37825c6f
  [Panlingual] Screen title is displayed incorrectly
 2022-04-08 11:32:21 +00:00
Ricky Wai
478ee3b873 Merge "Add hidden flag in ActivityOptions to ignore PendingIntent creator foreground state" into tm-dev am: 417df3f1e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17504687

Change-Id: I539333e16a574bb6867767fb04151ba167a4a256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 11:17:09 +00:00
Ricky Wai
417df3f1e9 Merge "Add hidden flag in ActivityOptions to ignore PendingIntent creator foreground state" into tm-dev 2022-04-08 11:13:22 +00:00
Michael Wright
af36777add Merge "DO NOT MERGE Remove PWLE APIs from T" into tm-dev am: 52f1d5eca6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17629782

Change-Id: I1623bb7df08c16d0a9987602b7eaa9e6fa1a1f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 11:04:10 +00:00
Michael Wright
031ea1530f DO NOT MERGE Remove PWLE APIs from T am: 38dc7aa55c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17629782

Change-Id: I82d07c65ad8b4cce97b1f211d980ab051d396675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 11:04:07 +00:00
Michael Wright
52f1d5eca6 Merge "DO NOT MERGE Remove PWLE APIs from T" into tm-dev 2022-04-08 10:57:11 +00:00
Santos Cordon
2694557dec Merge "Fixing some lint errors." into tm-dev am: 8a3aa30436 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570092

Change-Id: I981e116385cdfc0b94d9cad19dc6646e32594cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:56:56 +00:00
TreeHugger Robot
28d82d77e2 Merge "Add EXEMPTED logging name." into tm-dev am: 776e03ca75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17621514

Change-Id: I9a30f8731a8523ee93e51338cf9722bd90c5a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:55:32 +00:00
Santos Cordon
8a3aa30436 Merge "Fixing some lint errors." into tm-dev 2022-04-08 10:30:04 +00:00
Santos Cordon
a067e02a23 Merge changes from topic "presubmit-am-6170104819c543729fa6bc3469e8cc1d" into tm-mainline-prod 
* changes:
  [automerge] Fixing some lint errors. 2p: 7fd62f1eaf
  Fixing some lint errors.
 2022-04-08 10:30:04 +00:00
TreeHugger Robot
776e03ca75 Merge "Add EXEMPTED logging name." into tm-dev 2022-04-08 10:28:06 +00:00
Alan Stokes
19b5b2770d Merge "Log pending odsign metrics on start" am: 59137a2227 am: a6976f726d am: 1ef1c6a842 am: 240171e237 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058177

Change-Id: I6ce12c6bffd750cafcd5b8e2013accf6d9b809f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 09:49:14 +00:00
Alan Stokes
240171e237 Merge "Log pending odsign metrics on start" am: 59137a2227 am: a6976f726d am: 1ef1c6a842 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058177

Change-Id: Ide9144dbe1d5d7ada7885a14b723ce379807f0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 09:34:01 +00:00
Alan Stokes
1ef1c6a842 Merge "Log pending odsign metrics on start" am: 59137a2227 am: a6976f726d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058177

Change-Id: Ib1b561e9b5a4143878ed6337c8587fc5ba90733b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 09:12:43 +00:00
Alan Stokes
a6976f726d Merge "Log pending odsign metrics on start" am: 59137a2227 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058177

Change-Id: I63a1c1332703d55a720b8b4e3bd70af85c0be066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:44:08 +00:00
Alan Stokes
59137a2227 Merge "Log pending odsign metrics on start" 2022-04-08 08:20:49 +00:00
Tony Huang
f4570ff4bf Merge "Remove getSfInstance usage from ViewRootImpl" into tm-dev am: 9074b73ec7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17636144

Change-Id: I5d8e2df3afcca552c49eb9dba5650e35501ef048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:49:38 +00:00
Robert Horvath
279a352cae Merge "Change PiP stash scoring to distance moved" into tm-dev am: 85c6db27a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17409445

Change-Id: I018a3dbd9923cbc45ebffc819f56ca6d8939e2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:49:26 +00:00
Zoey Chen
044cce04a6 Merge "[LeAudio] Add new string and an icon for the broadcast swtich dialog" into tm-dev am: fe56683695 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17608149

Change-Id: I42af769339f79626b15a7094158ced07fe9f0b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:49:10 +00:00
TreeHugger Robot
5c2813fc7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ef188cc244 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibce1e013bae564ee0c370f2439a816158729d826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:48:35 +00:00
Tony Huang
9074b73ec7 Merge "Remove getSfInstance usage from ViewRootImpl" into tm-dev 2022-04-08 06:41:24 +00:00
Tony Huang
d04b30c7e0 Merge changes from topic "presubmit-am-8892555377a6429fb522f9a877d124f5" into tm-mainline-prod 
* changes:
  [automerge] Remove getSfInstance usage from ViewRootImpl 2p: a825a5c0d9
  Remove getSfInstance usage from ViewRootImpl
 2022-04-08 06:41:24 +00:00
Robert Horvath
85c6db27a4 Merge "Change PiP stash scoring to distance moved" into tm-dev 2022-04-08 06:39:14 +00:00
Zoey Chen
fe56683695 Merge "[LeAudio] Add new string and an icon for the broadcast swtich dialog" into tm-dev 2022-04-08 06:34:29 +00:00
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
ef188cc244 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 06:27:37 +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