Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
756,673 Commits 3 Branches 0 Tags
035a025262ab04d6a40feffc44dbb173ea05cce0
Commit Graph

756673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Laird
035a025262 Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8f5 am: aad97149d8 am: 6000d95598 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934942

Change-Id: If1c2aa050430daec1e1f8658de64527fecf7f0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:06:39 +00:00
Joanne Chung
313d6bfe04 Merge "Fix finishTranslation doesn't work if start Activity in the same task" into tm-dev 2022-04-08 15:53:22 +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
ccfcc3be92 Merge "BroadcastRecord's receivers could be null." into tm-dev 2022-04-08 15:47:51 +00:00
Evan Laird
6000d95598 Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8f5 am: aad97149d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934942

Change-Id: Ifd438f93c65d828e44b1c4608b6ba81e66d433c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 15:37:34 +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
Evan Laird
aad97149d8 Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934942

Change-Id: I2ec744fd7e823951bb5b8ae756ae3f596e41bfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 15:21:05 +00:00
Evan Laird
c5fbfeb8f5 Merge "Show 4G LTE and 4G LTE+ data connection type" 2022-04-08 15:05:57 +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
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
Joanne Chung
b9fe1923d9 Fix finishTranslation doesn't work if start Activity in the same task 
If the app starts a new Activity in the same task then the
finishTranslation() is called, the finish translation doesn't work
because our logic is to check if task top Activity is our expected
translation Activity. In this case, the top Activity is the new
Activity, the original Activity is paused in the same task. To fix
the problem, we get all non-finishing Activities in the task and
check if the target Activity in this task.

Bug: 202570916
Test: atest UiTranslationManagerTest
Test: atest CtsVoiceInteractionTestCases
Test: atest CtsAssistTestCases

Change-Id: I2471e04b894890777e13dd45c290f059dbe5f487
 2022-04-08 20:34:08 +08: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
Josh Hou
16b3ddf421 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev 2022-04-08 11:32:21 +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
52f1d5eca6 Merge "DO NOT MERGE Remove PWLE APIs from T" into tm-dev 2022-04-08 10:57:11 +00:00
Santos Cordon
8a3aa30436 Merge "Fixing some lint errors." into tm-dev 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
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
9074b73ec7 Merge "Remove getSfInstance usage from ViewRootImpl" into tm-dev 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
TreeHugger Robot
ef188cc244 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 06:27:37 +00:00
TreeHugger Robot
3fb79a3760 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 06:05:05 +00:00
Bill Yi
1ac62c27ad Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-08 05:09:44 +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
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
1a3b4ca6f8 Merge "Make sure mms proxy is hostname" into tm-dev 2022-04-08 03:04:25 +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
Josh Hou
db37825c6f [Panlingual] Screen title is displayed incorrectly 
Fix the issue that the screen title name of the app language page is
displayed incorrectly

Bug: 227285277
Test: Verify the issue by testing between the system language and app
language page

Change-Id: I229b9ff2defb68d70248a95886d8600e1bc464ea
 2022-04-08 09:52:56 +08:00
TreeHugger Robot
fa0b6921b0 Merge "Add fields for PhoneAccountHandle without IccIds in T" into tm-dev 2022-04-08 01:38:07 +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
Aishwarya Mallampati
2e894a2754 Merge "Revert "VoWifi notification for emergency calls"" into tm-dev 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
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
e9145245f5 Merge "Consolidate launch time change notifications." into tm-dev 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
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
Dave Mankoff
7605f736e4 Merge "Remove OverviewProxyService from NavBarView." into tm-dev 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
Michael Wright
38dc7aa55c DO NOT MERGE Remove PWLE APIs from T 
Fixes: 228529016
Test: build
Change-Id: Icfd576f3dff0850f464be32c5a3315e723c3d380
 2022-04-07 23:26:18 +00:00
huiyu
505838ed0b BroadcastRecord's receivers could be null. 
Bug: 227729678
Test: adb shell "am broadcast -a android.intent.action.BOOT_COMPLETED -n com.android.providers.media/.MediaScannerReceiver"
Change-Id: Idf4076a3e7d6e67bb00d3e90f479166e5b8682f4
 2022-04-07 16:20:42 -07:00
TreeHugger Robot
e0aee9342b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f534be93bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I414c4833dba42b0fe1bc2b096e8807a9805ae7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:51:40 +00:00
Beth Thibodeau
7e5c325086 Merge "Enable media session flag by default" into tm-dev 2022-04-07 22:49:55 +00:00