Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
481,823 Commits 3 Branches 0 Tags
fcd519fde9ba4a3fa7c6415685eb03019560df02
Commit Graph

481823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hufnagle
fcd519fde9 docs: Use correct profile for intent 
The ACTION_AUDIO_STATE_CHANGED intent action uses the HDP profile,
not the A2DP profile.

Bug: 158742305
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I4358aac8c8aa9fc8b36e517e568e5a9db538555e
 2020-10-19 21:08:17 -04:00
TreeHugger Robot
8b1151e4d5 Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev 2020-10-16 18:26:02 +00:00
Anton Hansson
47994f3743 Make framework-res dep in stubs explicit 
The android.jar stubs includes the resource from framework-res. This
dependency was previously added implicitly inside the build system, but
using a java_genrule we can add it directly, which makes it easier to
make changes to this rule.

This change has the side-effect of adding the resources to some stubs
that did not previously include the resources (e.g. module-libs), which
I think is desired.

Bug: 161214753
Test: build sdk, diff out/dist before and after (shows resources added
      to some stubs)
Change-Id: I1829789af207cc45c49c0c68369fc7c0c085bcb0
Merged-In: I1829789af207cc45c49c0c68369fc7c0c085bcb0
 2020-10-15 15:18:46 +00:00
Mark Goldstein
d5726423ca Doc: Fix typo the right way. Supersedes cl/318172931 
Bug: 170764224

Change-Id: Iaef1aa4fd3143e6e9019d06834001b3bfa3d887d

Exempt-from-owner-approval: Docs-only typo fix
 2020-10-14 20:38:09 +00:00
Charles Chen
c947b10f99 [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" 
This reverts commit ae03031efe.

Reason for revert: Merge the reverted patch by accident.

Bug: 162627132
Change-Id: Ic2f072730050cb47926cec6ed24af7ef9e5e7055
 2020-10-13 01:14:25 +00:00
TreeHugger Robot
936cd3b3f1 Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev 2020-10-12 11:28:41 +00:00
Linus Tufvesson
334190f26e Update javadoc for setLaunchDisplayId 
.. to match behavior post I1f9662c2bd14b34e00fbc8ebb926538f0329c37a

Bug: 167593637
Test: Javadoc change only.
Change-Id: I4cb9fe4a5ae74b1474f9da39b6aeb3a374f8cf12
 2020-10-09 09:54:40 +00:00
TreeHugger Robot
5ad4ec37a0 Merge "Do not re-initialize synthetic password" into rvc-dev 2020-10-08 10:37:53 +00:00
TreeHugger Robot
f1c038465d Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671
 2020-10-08 05:05:38 +00:00
TreeHugger Robot
e7069bce3c Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Ic730c4d98a309aadcde740d77582ffb7d788337f
 2020-10-08 04:54:24 +00:00
TreeHugger Robot
d29dc3d991 Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837
 2020-10-08 04:27:35 +00:00
TreeHugger Robot
a2a586a61a Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc
 2020-10-08 04:10:10 +00:00
TreeHugger Robot
83739b6db9 Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev 2020-10-08 03:40:59 +00:00
David Su
81373b0b89 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff6123ae0567a9066158c2c4b7a07ec3508e1bd7
 2020-10-08 02:13:39 +00:00
David Su
3ea188d4d2 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I85309b43227c6fcbea1310281ccf7b42981bf1ca
 2020-10-08 01:46:19 +00:00
David Su
3b9f0fb6c3 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c39f346377c9f591d4207b3c2288344470276e6
 2020-10-08 01:25:05 +00:00
David Su
88ec485f39 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36bdfb8c03950173e51ea9815a6fda619126aff8
 2020-10-08 00:53:06 +00:00
David Su
d840f0c7da [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: Idefd4af0be5dce2baf988135f3062029749dc95b
 2020-10-08 00:24:07 +00:00
David Su
816fd66d64 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I19aeca326d6f4faae382fb6a140acde81602eb3a
 2020-10-08 00:11:38 +00:00
David Su
752cb249a6 RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. 
sendBroadcastAsUserMultiplePermissions was added to Context.java.
Implementing in BridgeContext.

Fix oc-dev since BridgeContext is in frameworks/base/tools/layoutlib,
whereas in later branches the file is in frameworks/layoutlib

Test: Compile / build (actual usage is documented in other bugs)
Bug: 159373687
Change-Id: I8715b6fce7039268eb29914cb15f68ab922f4d3f
Merged-In: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
 2020-10-07 14:41:24 +00:00
David Su
008d947b59 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: If5edb76ce859af8506a381856c6b3b0058aee541
 2020-10-07 09:18:41 +00:00
David Su
4c94806e28 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Id637abc5705e488e2bc77122e052b9d3ea475ae3
 2020-10-07 08:32:52 +00:00
David Su
5c2b86fbed [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Ic97189261040a3eef447064ceed038727fb11120
 2020-10-07 08:16:39 +00:00
David Su
aeac5e7d30 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I7bedb3b7b8da1bdbe3f483b5186d7864ffc22f7a
 2020-10-07 07:58:20 +00:00
David Su
615d6b6ba6 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: If0bd01e56bc171cf50e01443bdac78bc149dd64b
 2020-10-07 07:44:33 +00:00
David Su
60cf3eebd5 Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: Ic35e179d67e2804f71d53489101d1c6efc05f156
 2020-10-07 01:03:33 +00:00
David Su
3c8124a242 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history

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

Change-Id: Ida2be85706ade89a4db9db7db97c8a027f47c05e
 2020-10-07 00:38:21 +00:00
wilsonshih
46bdd4af42 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I648c5523d1895dd93a49e39431894d504ea74e2b
 2020-10-07 00:37:53 +00:00
wilsonshih
254924da94 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I5cae667d955f7cf02180d1a30ee8cbff976f5bfb
 2020-10-07 00:37:43 +00:00
Automerger Merge Worker
75b7643622 Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 am: 8a6fa4c1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: I42f66a255836d5b92476484054756baad67de7b5
 2020-10-07 00:37:28 +00:00
Nathan Harold
94e5401f7e [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90b8806dfa4bf3b4717c1ecb50661487a9590717
 2020-10-07 00:36:45 +00:00
Nathan Harold
d5bb499052 [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fb22f36f2615f337699817083991ba741a3938e
 2020-10-07 00:36:38 +00:00
David Su
d1bcf628bd Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev 2020-10-07 00:04:30 +00:00
David Su
79148d590a [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history

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

Change-Id: Iafd009c9fb724e499a10a071fddec997a322de76
 2020-10-06 23:37:16 +00:00
David Su
b9edc63f80 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history

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

Change-Id: I375dcd7dd68d2cf8acb61024de119fc741c4124d
 2020-10-06 23:20:52 +00:00
David Su
8a936e088d [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history

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

Change-Id: I262bad1ed18fccf08bc40de1878fb5c6785ebad3
 2020-10-06 22:41:13 +00:00
David Su
3d92e370f5 Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev 2020-10-06 21:57:10 +00:00
wilsonshih
c201373d98 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: Ie492357129e045d664ece96ee032f78d43594175
 2020-10-06 19:56:38 +00:00
wilsonshih
7e24456d17 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I15107c6c6780c642467d8fa47c0a0b6f7dec95be
 2020-10-06 19:23:48 +00:00
wilsonshih
7e53b78946 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I458eff483892bb657dffa854c56a25ab694e38ac
 2020-10-06 18:33:59 +00:00
wilsonshih
b3fd083cb1 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I6749ecdc5cc0d355d27385326f81749d2ebfbac4
 2020-10-06 17:53:37 +00:00
Automerger Merge Worker
8a6fa4c1eb Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: Ifc2fb9150cfa823cb2aefd604a3ef2b2d0e5e8d3
 2020-10-06 17:53:30 +00:00
wilsonshih
286aa8b9b4 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I1892ed87e6727905e30cec3d0eb6bbba53656ca6
 2020-10-06 17:43:31 +00:00
wilsonshih
5b295c7726 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I6d3b4ea454c5cdc21eb681ede76387f46b9fdb43
 2020-10-06 17:09:16 +00:00
Automerger Merge Worker
2426f27569 Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev 2020-10-06 17:08:55 +00:00
Chris Tate
8a088693f9 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: If41066d2389e949e605d926b85b9683b4ed4f467
 2020-10-06 17:07:58 +00:00
Nathan Harold
e45ec287ed Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: If8b87dc5468c0f0d9c0fd93df2c116f08e080349
 2020-10-06 16:58:46 +00:00
Nathan Harold
e1a23c7ef6 [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: Ia7eefa1ef81a76c64cf14928bf12b40847d4b52a
 2020-10-06 16:58:32 +00:00
Chris Tate
676b35b98e Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: I186d804f3c47caa6b879f5b60713b7adf1ddf2e3
 2020-10-06 16:58:25 +00:00
Chris Tate
815ca2d7d8 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I2d7340a0279a9e3faa9a96743ea82d8bf4fce3fb
 2020-10-06 16:56:38 +00:00