Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
613,724 Commits 3 Branches 0 Tags
a021b767a6517fd448025c21bc825ee62df23fcf
Commit Graph

613724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
a021b767a6 Extend RollbackManagerService to handle S extensions 
Bug: 173114427
Test: RollbackUnitTest covers this
Change-Id: I2de18f67f21ea6c57d612829749edeaa11378f41
 2020-12-07 12:20:24 +00:00
Ulyana Trafimovich
dd6308cafb Merge "Revert^3 "[CEC Configuration] Add listener support to the HdmiCecConfig"" 2020-12-07 11:53:46 +00:00
Ulyana Trafimovich
fb66634ff2 Revert^3 "[CEC Configuration] Add listener support to the HdmiCecConfig" 
This reverts commit e7e7c59ed0.

Reason for revert: broken build 7016245 on git_master on aosp_arm64-userdebug

Bug: 174992882
Change-Id: If8c774006972f0c976bdca04d3524b8f67f0a2be
 2020-12-07 11:38:18 +00:00
TreeHugger Robot
68e000fbbc Merge "Revert "Revert "[CEC Configuration] Add listener support to the HdmiCecConfig""" 2020-12-07 10:36:39 +00:00
Zimuzo Ezeozue
96e342601e Merge "Block SAF directory access to /sdcard/Android" 2020-12-07 09:30:50 +00:00
Manish Singh
fef773201f Merge "Introduce new preference indicating user control." 2020-12-07 06:50:22 +00:00
Alexander Dorokhine
317f2eea78 Merge "Move externally synced framework files to an 'external' folder." 2020-12-07 06:25:30 +00:00
Alexander Dorokhine
2b8c1ecae4 Merge "Update AppSearch code from Jetpack." 2020-12-07 06:24:53 +00:00
TreeHugger Robot
f2b1d84060 Merge "Fix ConcurrentModificationException getting emergency nums" 2020-12-07 03:55:56 +00:00
TreeHugger Robot
6ea899bb5e Merge "Intruduce KeyCombinationManager to PhoneWindowManager" 2020-12-07 03:17:39 +00:00
Manish Singh
3b8d8bc781 Introduce new preference indicating user control. 
If the user enables this, then that means that we will respect user's
choices for all the preferences, i.e. we will not update the preferences
based on the updates from server.
On the other hand, if it's disabled, then the rest of the preferences
would not be considered.  And we'd decide their values based on the
values from the DeviceConfig (which in turn come from the server).

Also, renaming the set prop key for enabling-transcode to match the one
in DeviceConfig - transcode_enabled.

Also, the "transcode_enable_all" controller now enables (instead of
disabling) the global level transcoding.

BUG:169327180

Test: manual testing.

Change-Id: I183b3b5496b647943be377c02c8c9e2a0df71752
 2020-12-06 23:37:15 +00:00
TreeHugger Robot
c43d935c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71550d5204 -s ours am: cb702b1f63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8cd5faf0178e903a00a9becf94e6867b2268d75f
 2020-12-06 20:17:06 +00:00
TreeHugger Robot
cb702b1f63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71550d5204 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56434d3478b0365df99708dc8a92acb2e214bd4f
 2020-12-06 20:05:46 +00:00
TreeHugger Robot
71550d5204 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 19:40:19 +00:00
Treehugger Robot
20575d9e45 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours am: 5f470bae4a -s ours am: db8b134510 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I895e3618ae88318a437aa9465dbcbd2b2e1922f7
 2020-12-06 16:59:00 +00:00
Treehugger Robot
397f0caa17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours am: c092104a5d -s ours am: f1bde7bba3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3310a34810a4a02ecd7e44a6847fd3ab51d711
 2020-12-06 16:58:40 +00:00
Treehugger Robot
ceb1dab796 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours am: ace37a2868 -s ours am: e78ff11f75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb14033fd7e2c9d0316a90c9109a84db34c31483
 2020-12-06 16:58:28 +00:00
Treehugger Robot
0dcc613a0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours am: 336114b4b7 -s ours am: 22bca9c10b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b33d67c968eedc5c3b7b7a268b875c80d7a2b57
 2020-12-06 16:58:16 +00:00
Automerger Merge Worker
de58902b7a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master am: da7ac9e54c -s ours am: 5bb0f603f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5276f5f1be73c5daa82276f2cf1e5ae09c638e2b
 2020-12-06 16:58:04 +00:00
TreeHugger Robot
6c34f640b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours am: 8caaa711c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13c34ea454e4c64c20c22c42a227ab39008a0e8d
 2020-12-06 16:57:42 +00:00
Treehugger Robot
e710d32c8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours am: c0ab918d54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83cd2fc0e83d84d661a7823d4c48e655bc17aeb4
 2020-12-06 16:57:16 +00:00
Treehugger Robot
459fd156a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours am: 38957d5fba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e5f5f57bcf37506a90330b85ffb759478b01f2b
 2020-12-06 16:57:03 +00:00
Treehugger Robot
f3fd6cd7ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours am: 01a0745efd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a04435f2152b391460901aaebd6b77d1090cddc
 2020-12-06 16:56:49 +00:00
Treehugger Robot
0de544c1a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours am: c2605fa581 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic839f6c5877e44cc78df1182568f5225d16495f1
 2020-12-06 16:56:24 +00:00
Treehugger Robot
db8b134510 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours am: 5f470bae4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I921594e944c4ba039c160dca37466ee7b32775d4
 2020-12-06 16:56:17 +00:00
Treehugger Robot
970aabacc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours am: b6bec330c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie22ad3dc3466168504d81dfd1ee687bf9ed91107
 2020-12-06 16:55:56 +00:00
Treehugger Robot
5f470bae4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a343979692f971fab2373fbe5617566b0ccedd8
 2020-12-06 16:39:03 +00:00
Treehugger Robot
f1bde7bba3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours am: c092104a5d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4593c6a74d7075a1a263d84bc84d3750f0cb568a
 2020-12-06 16:38:22 +00:00
Treehugger Robot
4f9abbfb58 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:29:22 +00:00
Treehugger Robot
e78ff11f75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours am: ace37a2868 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e9077d396090c06bfe845ea10024f103d76fa51
 2020-12-06 16:21:52 +00:00
Treehugger Robot
22bca9c10b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours am: 336114b4b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1c06bdcfd2bb730b61315932f48501bb52bbcd0
 2020-12-06 16:21:42 +00:00
Treehugger Robot
c092104a5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8db57950d1f5b21380861fdcad717db985bdb89f
 2020-12-06 16:21:19 +00:00
Treehugger Robot
ace37a2868 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If84abf69c9d7284d6e95441d9d0bd6d7a3cb5b5d
 2020-12-06 16:17:43 +00:00
Automerger Merge Worker
5bb0f603f9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master am: da7ac9e54c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a675537840566aea1bfe04d804219627521ee9b
 2020-12-06 16:16:02 +00:00
TreeHugger Robot
8caaa711c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254
 2020-12-06 16:15:47 +00:00
Treehugger Robot
c0ab918d54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebb52096885b1ac32487e1cffe3a316f8da84c87
 2020-12-06 16:15:32 +00:00
Treehugger Robot
38957d5fba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89a8bf2848bab75410474218fb5bbd34f9b1d03f
 2020-12-06 16:15:18 +00:00
Treehugger Robot
01a0745efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ad37cea367eb14bb672610179fb8bf2a515e9ab
 2020-12-06 16:15:02 +00:00
Treehugger Robot
c2605fa581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15a8a69e3b0394ec18cafcd1c21666d12aa0a535
 2020-12-06 16:14:38 +00:00
Treehugger Robot
b6bec330c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa94c23d83065a82df2efbd69078af3fc1a2b599
 2020-12-06 16:14:09 +00:00
Treehugger Robot
336114b4b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibcafcd45189026a4f8ba513565c8cab5f247ac28
 2020-12-06 16:12:15 +00:00
Automerger Merge Worker
da7ac9e54c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master 2020-12-06 16:12:04 +00:00
TreeHugger Robot
c110ac2338 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:11:02 +00:00
Treehugger Robot
38b62a1d36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae372e5484ccdff96f5167f8e5bf3bf4d90cabea
 2020-12-06 16:07:41 +00:00
Treehugger Robot
0bf77bd9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaad525a1d20c429e63e82b0523496357ab79667c
 2020-12-06 16:05:41 +00:00
Treehugger Robot
728faae9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4251442532e811105feb509abd8081c9a23ce8a
 2020-12-06 16:04:13 +00:00
Treehugger Robot
21cdf6fe8d Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:02:02 +00:00
Treehugger Robot
7b6d6070bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I163e5a116492998f6b86e5d327e4c9c462db947d
 2020-12-06 16:01:29 +00:00
Treehugger Robot
c11efe23f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic382f59842d6f557ebf879a05eff1a38a22ec3e3
 2020-12-06 16:00:17 +00:00
Treehugger Robot
6e1c70339e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:58:12 +00:00