Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,001 Commits 3 Branches 0 Tags
2b3fee42d8c05b2e1b484cd8991fcecf6b9cc6bd
Commit Graph

566001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2b3fee42d8 Merge "Add OWNERS for long screenshots framework code" am: 79bed70aa2 am: 4df29fd76a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab3982e777395a9579505ad90b143c3b6c04b6f3
 2021-02-24 21:52:33 +00:00
Tianjie Xu
4910f14d0c Merge "Make the new RoR atoms compile" am: c70e8913a2 am: e16f153d11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68e7ed7e2aff3990f647d681e4add5209c2368fc
 2021-02-24 21:52:06 +00:00
Daniel Bright
604c3e2863 Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce86 am: 248a62077a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2b3702999d176c2ed86a6e0e9f05cf59563f5e2
 2021-02-24 21:51:26 +00:00
Andrei-Valentin Onea
8e7cddee2f Merge "Add genrules for merged system server stubs" am: f91d4e499c am: f86b249734 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596559

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32db1c7df1ff2e1da61f410a6a6c77876346891c
 2021-02-24 21:50:54 +00:00
Jeff Sharkey
4df29fd76a Merge "Add OWNERS for long screenshots framework code" am: 79bed70aa2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I916187da222fa9e100d9beb67866427b10481900
 2021-02-24 20:59:35 +00:00
Tianjie Xu
e16f153d11 Merge "Make the new RoR atoms compile" am: c70e8913a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc2a3248daedfb72664f25c2bb339f284ff01a7c
 2021-02-24 20:17:47 +00:00
Daniel Bright
248a62077a Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a0c4293a20daae9ac8efd24b9f96dba1db26581
 2021-02-24 19:57:22 +00:00
Andrei-Valentin Onea
f86b249734 Merge "Add genrules for merged system server stubs" am: f91d4e499c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596559

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieadaa858e9292bb936d50d5a66f344bcfad5298e
 2021-02-24 19:47:46 +00:00
Jeff Sharkey
79bed70aa2 Merge "Add OWNERS for long screenshots framework code" 2021-02-24 19:42:32 +00:00
Tianjie Xu
c70e8913a2 Merge "Make the new RoR atoms compile" 2021-02-24 18:38:17 +00:00
Daniel Bright
9816c0ce86 Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" 2021-02-24 18:36:18 +00:00
Andrei-Valentin Onea
f91d4e499c Merge "Add genrules for merged system server stubs" 2021-02-24 18:29:21 +00:00
Abhijeet Kaur
0877967417 Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" am: 789ff12ec1 am: a544a57512 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f544283749a14fc8f4a2c011deac048cf7768a
 2021-02-24 18:27:59 +00:00
Treehugger Robot
459135e09e Merge "Add new API for unattended reboot." am: 840727524d am: 89fb4563d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a7fbe5cd3e21344dea31b20a1274fde3201955d
 2021-02-24 18:27:34 +00:00
Eric Laurent
88ce193355 Merge "audio:Suppress device volume to safe volume" am: d2717d9e9d am: 9825982bcb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcb46717cded982013470d9a45346612ab1109e5
 2021-02-24 18:26:49 +00:00
Abhijeet Kaur
a544a57512 Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" am: 789ff12ec1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f57d8dd875390671527f46df93b5366133d946c
 2021-02-24 18:00:54 +00:00
Treehugger Robot
89fb4563d2 Merge "Add new API for unattended reboot." am: 840727524d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ae59e23924ad2f46549378860c91dcff20dbe3c
 2021-02-24 17:45:28 +00:00
Eric Laurent
9825982bcb Merge "audio:Suppress device volume to safe volume" am: d2717d9e9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2cccfe1c9157b15fa1fa383df22723f3319777e
 2021-02-24 17:28:00 +00:00
Abhijeet Kaur
789ff12ec1 Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" 2021-02-24 17:27:31 +00:00
Treehugger Robot
840727524d Merge "Add new API for unattended reboot." 2021-02-24 17:00:06 +00:00
James Mattis
d77e30fade Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 142f7c3e80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a26e63926019c37b639f59d5cd7ad901902e2b7
 2021-02-24 16:54:32 +00:00
James Mattis
142f7c3e80 Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I610c8356f00cbd983bcb155139db06d2e16d0748
 2021-02-24 15:57:46 +00:00
Eric Laurent
d2717d9e9d Merge "audio:Suppress device volume to safe volume" 2021-02-24 15:19:02 +00:00
James Mattis
8b3ccda6bb Merge "Unit test automation for Multi-Default Tracking" 2021-02-24 14:57:24 +00:00
Treehugger Robot
d662cc8a0f Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507 am: 4e5452499e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia277d4ad23688b7d421044d7c4fb7446f44fcc5c
 2021-02-24 10:27:04 +00:00
Treehugger Robot
4e5452499e Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9370bb9a7a28556bf0d92b5cf8bde699e3ad11d5
 2021-02-24 09:46:43 +00:00
Treehugger Robot
33b19a2507 Merge "Move CtsScopedStorageHostTest to group presubmit-large" 2021-02-24 08:59:20 +00:00
TreeHugger Robot
e40cc0a9d2 Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev am: 01f8961bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6
 2021-02-24 08:15:20 +00:00
TreeHugger Robot
01f8961bce Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev 2021-02-24 07:35:31 +00:00
TreeHugger Robot
538165c1d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8fa81e8f52 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b328562aac3f773466cad0eaf592a47447e3c97
 2021-02-24 07:14:45 +00:00
TreeHugger Robot
8fa81e8f52 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-24 06:20:09 +00:00
Treehugger Robot
1c12237ee3 Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabeb7 am: 1856a9efdd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35de41959fed409a49d101ea9ef3da5c4ced84b6
 2021-02-24 04:07:23 +00:00
liuxiaoyu7
834b5336d6 audio:Suppress device volume to safe volume 
If the device supports safe volume,
should lower the volume to a safe volume

Signed-off-by: liuxiaoyu7 <liuxiaoyu7@xiaomi.com>
Change-Id: Ib27aa56e5ecc9875f7515494a32571c30e178ef6
 2021-02-24 11:26:15 +08:00
James Mattis
0b82004d34 Unit test automation for Multi-Default Tracking 
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.

Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
 2021-02-23 19:03:34 -08:00
Treehugger Robot
1856a9efdd Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabeb7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5c0eea7f0e595dc3f65ccfb20e7f6797280c0d
 2021-02-24 03:00:41 +00:00
Treehugger Robot
6faddabeb7 Merge "Revert "Do not propogate test api access flags to Zygote."" 2021-02-24 02:20:37 +00:00
Treehugger Robot
155808b3e2 Merge "Defer UID data removal until after reading is finished" am: ce2d40870e am: 7fddb382f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0a26de931a690d5248d4449fa048a2abf2e7d71
 2021-02-24 02:07:31 +00:00
Cody Kesting
2beb965c06 Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5 am: 7d8db6692d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia85c2c51f678fc72afb4ca7ad457c56f36425ca9
 2021-02-24 02:07:12 +00:00
Treehugger Robot
7fddb382f7 Merge "Defer UID data removal until after reading is finished" am: ce2d40870e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96787bdcf17949de0df847c92ffe49b790225e74
 2021-02-24 01:49:38 +00:00
Cody Kesting
7d8db6692d Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia635aa47cc08fce5859df57908e6215ccf3b10f9
 2021-02-24 01:45:53 +00:00
Roshan Pius
7394e95f36 Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b am: 1d024a0e6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599639

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5d59fda78badffd826160743adbcfa990052537
 2021-02-24 01:43:56 +00:00
Roshan Pius
1d024a0e6a Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599639

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab7f841edba1f96b5b8248bdee88d9165f4d644e
 2021-02-24 01:30:53 +00:00
Marcus Hagerott
c0b2128dd2 Merge "Add more detail to javadocs for SimPhonebookContract" am: 57a0af04c5 am: dc54e7afdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37d21d22c504e16787e1bcc962fd233ff14a60a9
 2021-02-24 01:26:15 +00:00
Andrei-Valentin Onea
88e092a602 Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1c5f0f58b91016be9a4f7b75ff03ad218b623d3
 2021-02-24 01:25:37 +00:00
Paul Duffin
be50859a86 Merge "Add explicit dependency from android.test.base to hiddenapi annotations" am: d9373ecdaf am: 808984145e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6c54fc7ef4c18bbf73dfdd549934fcf72edbc8c
 2021-02-24 01:24:21 +00:00
Chiachang Wang
58becf95ef Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56 am: 5809c1f054 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53fdc5ad0cb8f6859c025a11b08ea7f77fb45442
 2021-02-24 01:24:02 +00:00
More Kuo
51beeda872 Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied9742a6d57932986ed4579b7760250f156cf415
 2021-02-24 01:23:48 +00:00
Kevin Han
2c842f3aa7 Merge "Register AppHibernationManager in service registry" am: 44183743e0 am: 0de60cd4e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied0817ca6d49f0861bdb929a6fca78a1d75cb729
 2021-02-24 01:23:36 +00:00
Paul Hu
85468ed557 Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I483e0db6e9aac5d8ca8d4aa6912fa6f66b198e87
 2021-02-24 01:23:09 +00:00
Marcus Hagerott
dc54e7afdf Merge "Add more detail to javadocs for SimPhonebookContract" am: 57a0af04c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id968da9f8ec6ada50d674def708662383bf6b382
 2021-02-24 01:22:51 +00:00