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
Treehugger Robot
db44950d25 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:22:57 +00:00
Benedict Wong
2527e8e270 Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675749

Change-Id: I5c5f42e2febe9770a37ec56083bfa9d796713d50
 2021-04-22 19:22:36 +00:00
Treehugger Robot
550e92d020 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfdc3dbaa4d62abe20cb54e518db4f5ae1e8da91
 2021-04-22 19:19:02 +00:00
Kweku Adams
3d7ff0a8d3 Merge "Ensure SyncManager doesn't schedule an EJ with a delay." into sc-dev 2021-04-22 19:17:49 +00:00
Varun Shah
3cb4aa35a9 Merge "Use direct-callback alarms in AppTimeLimitController." into sc-dev 2021-04-22 19:17:36 +00:00
Treehugger Robot
679c657122 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:16:57 +00:00
Treehugger Robot
7dbd97e972 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:16:46 +00:00
Winson
032e3d008e Add cert digest separator to pm app link output 
For easy copy-paste if someone is configuring their server to host an
assetlinks.json.

Bug: 184954099

Test: manual, pm get-app-links on device

Merged-In: I5ed3505d72b5522202743a49559fbf1230b5767e
Change-Id: I5ed3505d72b5522202743a49559fbf1230b5767e
 2021-04-22 19:15:16 +00:00
Treehugger Robot
741bd0cf46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0774753984 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f12f37fe2533cd486cd6a9dbc15569d2b53e45b
 2021-04-22 19:14:10 +00:00
Treehugger Robot
4bdc1121da Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:13:13 +00:00
Treehugger Robot
9cc37c9c2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4152a1944e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic15f0c4de2dd6c5f987ba106b5c04049adc877ed
 2021-04-22 19:11:02 +00:00
Treehugger Robot
9cc9dfb807 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9a162a8125 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a42e71ff97960148879df0160f72e71ecbfb874
 2021-04-22 19:07:22 +00:00
Treehugger Robot
59464d6fa9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:57:46 +00:00
Treehugger Robot
c2777a19e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 898529212a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46b0b0913de426b20ef57891d91def45fbb6df4c
 2021-04-22 18:54:36 +00:00
Chavi Weingarten
0498394f3e Merge "Use BLAST layer for snapshot starting windows" into sc-dev 2021-04-22 18:52:39 +00:00
Treehugger Robot
7645d47660 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am: cd548ffab2 -s ours am: 5519d32d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd3f8ea3a73eba9763b1577741b3930ec5a3fee7
 2021-04-22 18:52:01 +00:00
Treehugger Robot
2b348a40ae Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:51:35 +00:00
Eric Laurent
4d1a47aa84 [automerger skipped] Merge changes from topic "startAudioSource_issues" am: 45da2609b7 am: 28ccf9bf8e am: 22483664c9 -s ours 
am skip reason: skip tag Change-Id Iaa920c073885c2556a93a1b5ae23467fa6ffad4f with SHA-1 5253a31c7a is already in history

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

Change-Id: Ia108c87d279431e8feaad7e9c938afd3d7580627
 2021-04-22 18:51:25 +00:00
Francois Gaffie
5f3161c103 [automerger skipped] AudioSystem: startAudioSource: ensure port handle initialized am: 523571c3e8 am: 0f0651384c am: 2c8ec7bba6 -s ours 
am skip reason: skip tag Change-Id I4eb8046a1263aeb7d464d35a360a8adb77c4b1a5 with SHA-1 81b0519f04 is already in history

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

Change-Id: I8b833d0675fecdd9bf8c303128d1de4c6838b304
 2021-04-22 18:51:16 +00:00
Treehugger Robot
72c49f5bc3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:51:06 +00:00
Treehugger Robot
80cca06027 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:48:45 +00:00
Jeff Sharkey
67d4e1e079 Refinement of AttributionSource handling. 
Previous CLs had started passing AttributionSource values across
Binder calls inside BluetoothDevice instances, but this can cause
confuse the permission check logic in the future; we should instead
always aim to use the AttributionSource closest to the app making
the call, instead of parceling it.

This change also improves logging to highlight when we're quietly
treating a permission as denied, and when a UID is mismatched.

Bug: 186106084
Test: atest BluetoothInstrumentationTests
Change-Id: I5d3fdb3c573cb9e77474952d8680caa4c4c464eb
 2021-04-22 12:46:06 -06:00
Treehugger Robot
ba3a4a3680 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:44:26 +00:00
Treehugger Robot
0033ce1b28 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:39:56 +00:00
Jing Ji
ec5674a96b Move the callbacks in app died/crash handling out of WM global lock 
These callbacks would require the AM proc lock internally, result in
dead lock.

Bug: 186067587
Test: adb shell am monitor & crash app manually
Test: atest ActivityStarterTests
Test: presubmit
Change-Id: Ia1b95d7c4fca25cb6f21abf0c295aa51258b1e0c
 2021-04-22 11:38:40 -07:00
Treehugger Robot
1cb2c100e5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:37:13 +00:00
Treehugger Robot
7852f2af80 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:32:25 +00:00
Treehugger Robot
b5b6d3680a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:21:21 +00:00
Benedict Wong
9fe8fcdb37 Merge "Add null pointer check for mConfig in onSessionLost" 2021-04-22 18:20:16 +00:00
Treehugger Robot
199b0018ff Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:16:08 +00:00
Hongwei Wang
0df585fb8d Apply PictureInPictureSurfaceTransaction upon reparent 
When autoEnterPip from Task with multiple activities, besides passing
the mLastRecentsAnimationBounds we should also try to pass the last
PictureInPictureSurfaceTransaction to the new Task and apply both.

Changed also
- deprecate the last recents animation bounds and use the transaction only
- reset the transform once applied to the original task

Known issue: original task appears transparent in overview once.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hNZ0H62PqgVDEUGh1TVMiT
Bug: 184789412
Bug: 185509920
Test: manual with ApiDemos, see Video
Change-Id: I7fb77e41e1963e14ecaf53bd135d6b4cb24493c9
 2021-04-22 11:14:44 -07:00
Treehugger Robot
0774753984 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:12:08 +00:00
Treehugger Robot
4152a1944e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:08:16 +00:00
Treehugger Robot
9a162a8125 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:06:10 +00:00
Treehugger Robot
898529212a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:05:19 +00:00
TreeHugger Robot
386e8ba090 Merge "media: polish EncoderProfiles" into sc-dev 2021-04-22 18:03:17 +00:00
Dmitri Plotnikov
ae812a3080 Merge "Simplify navigation in BatteryStatsViewer" into sc-dev 2021-04-22 17:57:26 +00:00
Bill Yi
1021a95849 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iec8f0355ab8f335ba41e01ed64f94fbdd41e1ef5
 2021-04-22 10:56:44 -07:00
Seigo Nonaka
80269f9f2b Use PostScript name as a key of updated font map 
Bug: 185818011
Test: atest FontManagerTest
Test: atest UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Test: atest FontFamilyUpdateRequestTest
Test: atest PersistentSystemFontConfigTest
Test: atest SystemFontsUniqueNameTest

Change-Id: I78e6ee962dbd50201105599361727b71de11cf2a
 2021-04-22 10:51:32 -07:00
Lucas Dupin
1ddd959e96 Merge "Do not reload theme when managed profile" into sc-dev 2021-04-22 17:32:01 +00:00
Treehugger Robot
5519d32d4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am: cd548ffab2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67fb31dd6bd621631ca030ef82ae39bf1fbe5038
 2021-04-22 17:31:04 +00:00
Eric Laurent
22483664c9 Merge changes from topic "startAudioSource_issues" am: 45da2609b7 am: 28ccf9bf8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678048

Change-Id: I3de8128a6e2860e99effc18a6753eeea25213767
 2021-04-22 17:30:55 +00:00
Francois Gaffie
2c8ec7bba6 AudioSystem: startAudioSource: ensure port handle initialized am: 523571c3e8 am: 0f0651384c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679496

Change-Id: I11a7708654089bf8e22fd9659f42d51e4f97e61d
 2021-04-22 17:30:52 +00:00
Flavio Fiszman
18a6aa1e34 Merge "Change message count overflow to 6" into sc-dev 2021-04-22 17:26:49 +00:00
Bill Yi
6d7588ff90 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I88571b2224d3ce002c0b714c35d8c609f995dc03
 2021-04-22 10:25:04 -07:00
kholoud mohamed
e311f273d4 Changed dpm shell commands to use 'cmd device_policy' 
Added the missing commands to DevicePolicyManagerServiceShellCommand and
changed 'adb shell dpm' to call 'adb shell cmd device_policy'

Fixes: 173381875
Test: atest com.android.bedstead.nene.devicepolicy.DevicePolicyTest
Test: atest com.android.bedstead.nene.devicepolicy.ProfileOwnerTest
Test: atest com.android.bedstead.nene.devicepolicy.DeviceOwnerTest
Test: manually tested the migrated commands
Change-Id: Id86382f11cf8197230ef62c33961e01b0b541358
 2021-04-22 18:21:49 +01:00
Bill Yi
2c8be38df4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e58733b9d40e871e8f70dfeadc7b877d24a444d
 2021-04-22 10:20:17 -07:00
Bill Yi
f7a0b334b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I24cb0c03387e1985a9afb23483809d28dffa7701
 2021-04-22 10:16:38 -07:00
Bill Yi
94594d3e3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I66ae9718017fd78da2a69cd96a109639ccff6781
 2021-04-22 10:15:07 -07:00
Brad Ebinger
75beeaee6f Merge "Use a typesafe pattern for SIP Delegate configurations" am: 0305ec6109 am: f3e197f2b1 am: bb7fc790f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682947

Change-Id: Iae7d0c1e64a37e8b76c0e34afe71a6cbc042c27b
 2021-04-22 17:13:38 +00:00