drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
616,418 Commits 1 Branch 0 Tags
Commit Graph

616418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
ed548e8e02 Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 4d90f237f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519790

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbd7dafd1b5b2387f64991d7d8c41b62c7a97e3f
 2020-12-23 03:58:04 +00:00
Jacky Kao
80401a0a1c Merge "Keep changed focus data after service disable" 2020-12-23 03:57:59 +00:00
TreeHugger Robot
9df82ca4cc Merge "Make IInputMethodManager to oneway (6/N)" 2020-12-23 03:52:54 +00:00
Chong Zhang
366ef60790 Merge "transcoding: move MediaTranscodeManager to apex" 2020-12-23 03:28:03 +00:00
Remi NGUYEN VAN
4d90f237f2 Merge "Fix testDeclareNetworkRequestUnfulfillable on R" 2020-12-23 03:25:54 +00:00
Wilson Wu
4a820ccc41 Make IInputMethodManager to oneway (7/N) 
1. Create InputMethodInfoList result callback and apply it to :
   -. getInputMethodList
   -. getEnabledInputMethodList

2. Apply IntResultCallback to getInputMethodWindowVisibleHeight

Bug: 163453493
Test: Manual test with keyboard
Test: atest CtsInputMethodTestCases
Change-Id: Iaa63e01453da4ff0e3f446eac036b3be3180cb73
 2020-12-23 10:27:05 +08:00
Remi NGUYEN VAN
23f93322c2 Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: 635d60201d am: edc6b0fb67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief9d6a1fae360dbe1c43d5d6bac4dad5850c004b
 2020-12-23 02:22:35 +00:00
Remi NGUYEN VAN
edc6b0fb67 Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: 635d60201d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
 2020-12-23 02:07:05 +00:00
Shuo Qian
72375f9bcd [automerger skipped] Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446 am: 7a9c93d3d2 am: 9bcf079a9c -s ours 
am skip reason: Change-Id I5812469dfb96f30b5b185fc1bb983e3357bb4efa with SHA-1 f4ded970a7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic147a04aec1667b1479a9b467e2ef40db623761e
 2020-12-23 02:00:05 +00:00
David Su
b08a9e432a Merge "FrameworksWifiNonUpdatableApiTest: make APK package name unique" 2020-12-23 01:57:52 +00:00
Amy Zhang
76469cbed4 Merge "Only allow RecordDVR to flush buffer when the DVR is stopped" 2020-12-23 01:51:55 +00:00
TreeHugger Robot
bfce445c9d Merge "Remove unnecessary broadcast receiver" 2020-12-23 01:51:53 +00:00
Remi NGUYEN VAN
635d60201d Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa5503f829077f70803e2e865f58c6e4691d1a73
 2020-12-23 01:37:12 +00:00
Shuo Qian
9bcf079a9c Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446 am: 7a9c93d3d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I716654b640cd3366452dcdd8a82a21da001a273e
 2020-12-23 01:28:12 +00:00
Remi NGUYEN VAN
3ed4fd3a89 Merge "Split NetworkUtils and NetworkUtilsInternal" 2020-12-23 01:19:27 +00:00
Daniel Bright
cbc22acd5d Merge "Add S-NSSAI" 2020-12-23 00:52:26 +00:00
Shuo Qian
7a9c93d3d2 Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69a5bf9467a9dcf73bb24d5940870c3b5b6ad9b1
 2020-12-23 00:39:07 +00:00
Chalard Jean
1db5eb52fd Merge "Use net-utils-framework-common" 2020-12-23 00:37:38 +00:00
Jing Ji
44d39aee72 Lock the CoreSettings in ActivityThread separately 
To fix a deadlock between the locks 'mResourceManager' and LoadedApk

Bug: 175361185
Test: atest FrameworksServicesTests:CoreSettingsObserverTest
Test: atest FrameworksCoreTests:ActivityThreadTest
Test: atest CtsGpuToolsHostTestCases:CtsRootlessGpuDebugHostTest
Test: Manual - adb shell am refresh-settings-cache
Change-Id: I283e7edb51ea1305a4beb31a4e0b5c751ccb8607
 2020-12-22 16:33:00 -08:00
Shuo Qian
dbee5f7446 Merge "Fix ConcurrentModificationException of getEmergencyNumberList" 2020-12-23 00:18:09 +00:00
Daniel Norman
4209c4bc3f Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b88a am: 96acd833fc am: f15eb86be0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d16d3b3d878c698bd0fc650bc25dc50c41e5bbc
 2020-12-23 00:01:53 +00:00
Treehugger Robot
137003fd24 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 am: ea70d5adc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9154535efa649300ee1b7a27e7739f24cf037b5b
 2020-12-23 00:01:23 +00:00
TreeHugger Robot
9fc348c9b9 Merge "Add support for reading XMP from HEIF" 2020-12-22 23:32:45 +00:00
Daniel Norman
f15eb86be0 Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b88a am: 96acd833fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdbd216ae01326dbaf20e6db7e103351ada9427a
 2020-12-22 23:23:52 +00:00
Treehugger Robot
ea70d5adc2 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4370f8059802250c5bd9112a10573effba8551e
 2020-12-22 23:23:24 +00:00
Daniel Norman
96acd833fc Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b88a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I781f2762bbc45a0e9c71932bf79afbadda2e8878
 2020-12-22 23:06:49 +00:00
Treehugger Robot
e897f5f8d6 Merge "Add owner to codegen annotations" am: 7765329813 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d22bc32e226d1aa9c04c72bdc2e25ca5591cfe4
 2020-12-22 23:01:00 +00:00
Shuo Qian
7b9960aa2e Fix ConcurrentModificationException of getEmergencyNumberList 
Test: atest; treehugger
Bug: 171542607
Change-Id: I5812469dfb96f30b5b185fc1bb983e3357bb4efa
Merged-In: I5812469dfb96f30b5b185fc1bb983e3357bb4efa
(cherry picked from commit f4ded970a7437c4c2c064cc7dded94da61b8a8a5)
 2020-12-22 22:59:59 +00:00
Amy Zhang
0317f6db48 Only allow RecordDVR to flush buffer when the DVR is stopped 
Test: make services
Bug: 176108239
Change-Id: I5fa31c34cac83bb5952576adf86c5a31ec62d9b5
 2020-12-22 14:55:00 -08:00
Lyn Han
4d2985030e Merge "Set NSSL debug lines to different colors" 2020-12-22 22:47:45 +00:00
Daniel Norman
ea8ca4b88a Merge "Updates noparent to only apply to the per-file files." 2020-12-22 22:27:12 +00:00
Treehugger Robot
7765329813 Merge "Add owner to codegen annotations" 2020-12-22 22:16:51 +00:00
TreeHugger Robot
9b59c503b1 Merge "Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons" 2020-12-22 22:11:58 +00:00
David Su
70d592c97b [automerger skipped] frameworks/base/wifi: Move migration_samples to non-updatable directory am: e0e31770cd -s ours 
am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96f8971e07db8d3da161d3437cf64070f4a8d16c
 2020-12-22 21:34:47 +00:00
David Su
cf27fdddee Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" 2020-12-22 21:28:27 +00:00
Greg Kaiser
5a7b24f6a1 Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b3317 am: 3033b15191 am: 9ad1f6565e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1a974bd0456efbf92a1be1fbc5ace38499e636
 2020-12-22 21:07:25 +00:00
Treehugger Robot
cc5488287c [automerger skipped] Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b714 am: 7f1d2693f0 am: b3eb55e432 -s ours 
am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If73ddfb193f3e9970d2626ddf9412fcc832f436f
 2020-12-22 21:04:43 +00:00
Ruslan Tkhakokhov
9aaffe3c5c Temporarily disable the new adb backup behavior 
Fall back to using the legacy android:allowBackup flag for apps that
don't specify the new ALLOW_ADB_BACKUP property. This is done to not
break GTS tests that rely on adb backup since corresponding apps can't
use ALLOW_ADB_BACKUP yet (ag/13205188 is blocked with some failure that
I'm  currently investigating).

Bug: 175250895
Test: atest CtsBackupHostTestCases
Change-Id: Id40b2ae6b677afca18011077f57926518b28960f
 2020-12-22 20:37:30 +00:00
Daniel Norman
94a2752536 Updates noparent to only apply to the per-file files. 
This is needed to fix invalid OWNERS for other files in this directory.

Test: n/a
Change-Id: I5d6d4b8c578ba066cf968cb719b6dd29693f017b
 2020-12-22 20:35:04 +00:00
Greg Kaiser
9ad1f6565e Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b3317 am: 3033b15191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id150e14508f5b4577563702b199cca10b2df8b55
 2020-12-22 20:33:30 +00:00
Treehugger Robot
b3eb55e432 Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b714 am: 7f1d2693f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad285dde28e1259a9de2bc08cc3ef9a56f1d2c0a
 2020-12-22 20:32:50 +00:00
Greg Kaiser
3033b15191 Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b3317 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia75d807642fcc87a65171d8ccc58e7e14ac34672
 2020-12-22 20:16:34 +00:00
Treehugger Robot
7f1d2693f0 Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b714 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03512fd0a6f9f336182999dca0daa19d65496843
 2020-12-22 20:11:38 +00:00
Bill Yi
1d6e9e97dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e3b8fefa2 -s ours am: 523548f143 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f88b4217cb92f7830ee511a5720479011915fb7
 2020-12-22 19:42:37 +00:00
Greg Kaiser
469e5b3317 Merge "Revert "Fix permission on TM#isDataEnabled"" 2020-12-22 19:36:50 +00:00
Chong Zhang
864d0b7220 transcoding: move MediaTranscodeManager to apex 
bug: 159172726
test: builds; presubmit; manual testing transcoding locally.
Change-Id: I727912a04cf4f7f03fdf5fa0a74e522f69dca66f
 2020-12-22 19:34:46 +00:00
Treehugger Robot
eff887b714 Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" 2020-12-22 19:34:10 +00:00
Beverly Tai
ee16d09327 Merge "Fix the device been wake up after dozing." 2020-12-22 19:16:57 +00:00
Beverly Tai
31ba6b58cb Merge "Add logs to NextAlarmController" 2020-12-22 19:16:16 +00:00
Bill Yi
523548f143 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e3b8fefa2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a3bb61171ff99ea5184124d201348c664d7612
 2020-12-22 19:08:50 +00:00