Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,958 Commits 3 Branches 0 Tags
477fdc1a3ba2a820544bbe61dc638bcd8ebd64ce
Commit Graph

640958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wesley Wang
39f3d9bb08 Merge "Make LayoutPreference summary text support multiple lines" into sc-dev 2021-04-27 13:22:54 +00:00
Zoey Chen
6930ca1e6d [Telephony] Clean up: remove getApnTypeStringInternal 
Bug: 181696914
Test: make
Change-Id: Ia79bb9eaa1fc43a2995730da47289274f94d67fe
 2021-04-27 21:18:52 +08:00
Nataniel Borges
73e2773099 Disable flaky pip/app close tests (flicker) 
Some tests are still flaky and affecting presubmit

Bug: 185400889
Test: atest FlickerTests WMShellFlickerTests
Change-Id: I477799646791c69b71c6f29d71e87caba900a983
 2021-04-27 14:58:56 +02:00
Kholoud Mohamed
4b2ce108a8 Revert "Revert "Changed dpm shell commands to use 'cmd device_policy'"" 
This reverts commit dc70c57eaf.

Reason for revert: Fixed failing test

Change-Id: Ib434365f441d69853ea3af6da7f3c663c16e5e1e
 2021-04-27 12:54:46 +00:00
Marin Shalamanov
c48e5da476 Update javadoc for setFrameRate 
Explicitly state that when fps=0 the other two parameters
of setFrameRate are ignored.

Bug: 161776961
Test: n/a
Change-Id: If5ecbbf053aa59071f19f6c7ba9ae0af9f15451b
 2021-04-27 14:31:27 +02:00
Benjamin Franz
d6124893c0 Document version codes in CompatChanges API 
Bug: 184654568
Test: make docs
Change-Id: Ie3bc5cccefd794cdd75be9c61d707b8679025ad8
 2021-04-27 12:29:31 +00:00
Riddle Hsu
ac93ee9b1c Merge "Fix creating unexpected letterbox surfaces" into sc-dev 2021-04-27 12:19:09 +00:00
Rhed Jao
d1db8f8c9d Fix missing the implementation of Computer#dump() in ComputerLocked 
It's necessary to implement the Computer#dump() in ComputerLocked
to ensure a lock is held when the snapshot feature is disabled.

Bug: 186505771
Test: adb bugreport
Change-Id: I9d3d371320c8e9a550a93177045a5f0ccbb32ffe
 2021-04-27 12:11:32 +00:00
Jordan Demeulenaere
d235e38aef Merge "Close the shade when launch animation is cancelled." into sc-dev 2021-04-27 11:42:27 +00:00
Rubin Xu
c4611f2b33 LockSettingsService: migrate to its own keystore namespace 
Moves keystore keys used by LockSettingsService to a separate
namespace, migrating existing key during boot if needed.
Affected keys are encryption keys for synthetic password blob,
unified profile challenge encryption key and unified profile
challenge cache key.

Bug: 184664830
Test: atest com.android.server.locksettings
Change-Id: Iac339e64812232875afa9dc6109b848b50b0ef2f
Merged-In: Iac339e64812232875afa9dc6109b848b50b0ef2f
 2021-04-27 11:41:40 +00:00
Rubin Xu
35f7ac1b3d Merge "LockSettingsService: migrate to its own keystore namespace" into sc-dev 2021-04-27 11:40:34 +00:00
Lorenzo Colitti
bd446384c8 Remove EXTRA_PROXY_INFO. 
This has been deprecated since M because it very error-prone, and
there are documented replacements.

Test: m
Bug: 171872228
Change-Id: Ide9846a26fc440b3ec5b4e4b444a046e738de3d6
 2021-04-27 20:01:22 +09:00
Bill Yi
6ccf648430 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia53d57d373177f9dfa41029a20783ef4ff210872
 2021-04-27 10:58:05 +00:00
Bill Yi
661c08697b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie027f68c69b715e4505a89887089f86f19a5b16f
 2021-04-27 10:54:38 +00:00
Bill Lin
99d6eee148 Revert "Revert "1/ Add onStartTransition() callback for SYSUI_ST..." 
Revert submission 14315426-revert_fix_ohm_exit_flicker

Reason for revert: The root cause of b/186197537 is ag/14296935
I should safe to re-landing the 2 CLs

Reverted Changes: 
Ifd17094f0:Revert "1/ Add onStartTransition() callback for SY...
Ia921d073c:Revert "2/ Resolve gesture one handed conflicts sw...

Change-Id: Ieccadf78ab873e00efa5102348c3787f00bd3275
 2021-04-27 10:13:29 +00:00
Santiago Seifert
9f5e9b242b Add log session id to MediaParser 
Bug: 167036690
Test: atest CtsMediaParserHostTestCases
Change-Id: Idee9c7248ee6107379c8e58410346b8c92d3c250
Merged-In: Idee9c7248ee6107379c8e58410346b8c92d3c250
 2021-04-27 09:19:29 +00:00
Hyundo Moon
34029e0082 Fix failing MediaRouter2ManagerTest 
The test failed for several reasons:
 - When other real cast device is present, tests are run before actual
   routes arrive.
 - Screen is not turned on during test.
 - Test lacks MEDIA_CONTENT_CONTROL permission.

This CL fixes the test.

Bug: 186190171
Test: atest com.android.mediaroutertest.MediaRouter2ManagerTest \
        --rerun-until-failure
Change-Id: I6f86ae7cba25871ffb7c8ee96f4c8db6bd86b816
 2021-04-27 17:59:47 +09:00
PETER LIANG
9fadb60b3d Merge "Fix the jelly effect when scrolling the a11y floating menu." into sc-dev 2021-04-27 08:44:16 +00:00
Louis Chang
b64eddc2c9 [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours 
am skip reason: skip tag Change-Id I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: Iedeec7dd9ae6db7dc85ac97054df36170b068a46
 2021-04-27 08:44:09 +00:00
Louis Chang
850810d0fd [automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours 
am skip reason: skipped by user louischang

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

Change-Id: Id9f2bbc5603a916e594ea4c61a9442043ebe8278
 2021-04-27 08:43:37 +00:00
Philip Junker
61a583e365 Merge "Add test case for opening light session with priority" into sc-dev 2021-04-27 08:40:52 +00:00
Chris Ye
d398fb78a9 Add Builder to LightState. 
Add Builder to LightState to replace the static constructors. Add
documents for Player ID lights. Changed input device lights types
definition to avoid future collsion with HAL light types.

Bug: 181743615
Test: atest InputDeviceLightsManagerTest
Change-Id: Ie47ef901006220d622677117c7ecd6ee41cf10f6
 2021-04-27 00:54:36 -07:00
Suprabh Shukla
36cb0aa1e1 Merge "Adding metrics to alarm manager" into sc-dev 2021-04-27 07:27:06 +00:00
TreeHugger Robot
e704f71c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 84e56ba65f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id28bf848d93341544969124040894633510e0111
 2021-04-27 06:53:57 +00:00
Wilson Wu
5577a28e2d Merge "Enable USE_REPORT_WINDOW_GAINED_FOCUS_ASYNC" into sc-dev 2021-04-27 06:32:17 +00:00
TreeHugger Robot
b12a08035c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: add93be4fb -s ours am: e7910c734c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4880c795c9edd5745e9749393faea492aa549a25
 2021-04-27 06:31:00 +00:00
TreeHugger Robot
6b384d431e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6dbad0bbce -s ours am: 7fb5e9971f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbe491d016aa5f4d55a730f60152032aa20fca18
 2021-04-27 06:30:34 +00:00
Qi Wang
0ebb4d88a1 Merge "Validate spell checker suggestions before applying." into sc-dev 2021-04-27 06:26:43 +00:00
TreeHugger Robot
8c87ff6aff Merge "Update IME control target when windowConfiguration changed" into sc-dev 2021-04-27 06:08:15 +00:00
TreeHugger Robot
84e56ba65f Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 06:08:03 +00:00
TreeHugger Robot
e7910c734c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: add93be4fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib37fd321285a144447d0c551c095978f0e69d160
 2021-04-27 06:06:53 +00:00
TreeHugger Robot
7fb5e9971f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6dbad0bbce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id51cc462e8b47f06db9c0d88eba96ca736bd3fe7
 2021-04-27 06:06:42 +00:00
Rhed Jao
bf53e16efd Merge "Fix a crash when starting a service in the isolated split" into sc-dev 2021-04-27 06:06:16 +00:00
Lucas Lin
56491b4c1e Merge "Update PrivateDnsMode from StringDef to IntDef" into sc-dev 2021-04-27 06:03:14 +00:00
TreeHugger Robot
b1dc2fcda1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fdcc3961f0 -s ours am: c3eff95544 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If668d61d6066c3716bc3817db4d902b60dd8d9e0
 2021-04-27 06:01:32 +00:00
Wei Sheng Shih
11b1cb280b Merge "Load higher resolution resource for icon on splash screen when needed" into sc-dev 2021-04-27 06:01:29 +00:00
Louis Chang
5a08074535 [automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-dev am: 222c4dea29 am: 224112b3f6 am: d1d589b94d -s ours 
am skip reason: skip tag Change-Id I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history

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

Change-Id: I4a3e5821ca147bdddbcc8fbe2f08322844a90a4c
 2021-04-27 06:01:13 +00:00
Les Lee
ba1e643715 Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94 am: debea981d9 am: 638b67a58f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
 2021-04-27 06:00:48 +00:00
TreeHugger Robot
d1ba349402 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 77f7a644c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7cb29cbe435c89325c0a94a00ee0056a876eddd
 2021-04-27 05:59:55 +00:00
Jooyung Han
8e8ff04874 Merge "resolve merge conflicts of 2028343503 to sc-dev" into sc-dev 2021-04-27 05:56:08 +00:00
TreeHugger Robot
add93be4fb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 05:46:23 +00:00
TreeHugger Robot
6dbad0bbce Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 05:45:40 +00:00
TreeHugger Robot
77f7a644c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 05:39:39 +00:00
Jerry Chang
8bfee40f41 Prevent caching unexpected IME status while showing keyguard in split 
While showing keyguard in split, it hides divder bar surface instead of
updating visibility of divider bar view. Updates to make sure
DividerImeController only caches IME status when the divider bar surface
is shown.

Fix: 186466549
Test: manul check password keyguard while in split
Change-Id: I64b406ea3d93cc196fe3304720391b8cb5310111
 2021-04-27 13:36:45 +08:00
Louis Chang
1c750cd367 [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours 
am skip reason: skip tag Change-Id I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 fe5e1432cf is already in history

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

Change-Id: I3d9c5b0efa38727c820032f11344b9145206bf28
 2021-04-27 05:18:41 +00:00
TreeHugger Robot
5496487dc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ea9612a412 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70dbe9ee8bff885738147ed6583905b11f748c18
 2021-04-27 05:11:17 +00:00
TreeHugger Robot
c3eff95544 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fdcc3961f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id70c32ccc5923034665bb7464738b4a4366a93d9
 2021-04-27 05:10:39 +00:00
Bill Yi
95fb5eaf2f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaa6baa6b461064c65c5e6d1b62389d706d8f6ca7
 2021-04-27 05:00:01 +00:00
Bill Yi
d7de1821dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I74f19a15b0697f7cdd2f5bd7347b98e12baf9427
 2021-04-27 04:44:05 +00:00
TreeHugger Robot
fdcc3961f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 04:40:43 +00:00