Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,440 Commits 3 Branches 0 Tags
fcaf2e20ba7673c6aed558f18bf963f45ea3323d
Commit Graph

485440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
45faf04f53 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e95a44cc6f421d454f7d42e538a8f25c1d29471
 2021-02-02 23:28:13 +00:00
TreeHugger Robot
99e5a28c5b Merge changes from topic "cdm_overlay-pi-dev" into pi-dev 
* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
 2021-02-02 23:03:57 +00:00
TreeHugger Robot
e42ea74fb1 Merge "[SettingsProvider] extend font size scale range" into rvc-dev 2021-02-02 22:37:12 +00:00
TreeHugger Robot
4097309ffc Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev 2021-02-02 22:36:47 +00:00
TreeHugger Robot
a9638beba3 Merge "[SettingsProvider] extend font size scale range" into qt-dev 2021-02-02 22:36:24 +00:00
Jonathan Scott
7a974a5468 [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. 
USER_CURRENT is not an acceptable input to isSecure(). The test has also
been updated as the use of any() for the mock hid this bug.

Test: atest LockTaskControllerTest
Bug: 176801033
Change-Id: Ic080eddb04ce9c20ebb6118abe8a48d28c7f67e5
 2021-02-01 17:51:13 +00:00
David Su
9dd63c5794 Merge "services.net-module-wifi - set min_sdk_level to 30" into mainline-prod 2021-02-01 16:59:03 +00:00
Bill Yi
4151d4742e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-02-01 15:57:16 +00:00
Anton Hansson
ac30bb5247 Merge "Remove unused API defaults" into mainline-prod 2021-02-01 14:12:49 +00:00
Anton Hansson
1467d174df Merge changes from topic "presubmit-am-a914d38dbf2a4fd283cd25bda2526870" into mainline-prod 
* changes:
  Correct visibility to use __pkg__
  Make framework-all composed of other framework jars
  Prevent default use of framework module implementation
  Set installable: false on apex jars by default
  Limit build visibility of modules in apex/...
  Suppress [CallbackInterface] metalava rule for mainline modules.
 2021-02-01 11:33:47 +00:00
Paul Duffin
e241c45dd2 Remove unused API defaults 
Bug: 155164730
Test: m nothing
Change-Id: I312de1cc3d4ac493d3570d3b6ad6e94e6cb4e4db
Merged-In: I312de1cc3d4ac493d3570d3b6ad6e94e6cb4e4db
 2021-02-01 11:27:53 +00:00
Liz Kammer
622dc78b58 Correct visibility to use __pkg__ 
Test: m nothing
Merged-In: I2dcf7f0f24948422e0ffd4880846313a75d467d2
Change-Id: I2dcf7f0f24948422e0ffd4880846313a75d467d2
 2021-02-01 11:27:33 +00:00
Anton Hansson
486eb760ac Make framework-all composed of other framework jars 
(partial cherry-pick)

This avoids duplicating the compilation of the module java source
code, as well as maintaining the compilation rules in two places.

Bug: 149906971
Test: m FrameworkServicesRoboTests
Change-Id: I1cea62aaedb7e653648130e3d315761c0c9aece4
Merged-In: I1cea62aaedb7e653648130e3d315761c0c9aece4
 2021-02-01 11:27:16 +00:00
Paul Duffin
09159170d7 Prevent default use of framework module implementation 
Prevent dependencies that do not specify an sdk_version from accessing
the implementation library of a framework module by default and force
them to use stubs instead.

Bug: 155164730
Test: m nothing
Merged-In: Ib60e538a4017857eefa3465e56745c00306887e1
Change-Id: Ib60e538a4017857eefa3465e56745c00306887e1
 2021-02-01 11:26:55 +00:00
Anton Hansson
dd124428ca Set installable: false on apex jars by default 
They shouldn't be installed, so don't generate install rules.

Test: m
Merged-In: I87a6a577b98d1140b5882d4c72f875914d551287
Change-Id: I87a6a577b98d1140b5882d4c72f875914d551287
 2021-02-01 11:26:43 +00:00
Anton Hansson
42fd56a03b Limit build visibility of modules in apex/... 
This changes the default visibility of soong modules in this directory
to __subpackages__, from the current public default.

This helps accidental dependencies sneaking in without intent from
the module owner.

Bug: 175604587
Test: m nothing
Exempt-From-Owner-Approval: cp
Merged-In: I1df8b8e087d27f62ce8c09d7e6e32d511efdba6b
Change-Id: I1df8b8e087d27f62ce8c09d7e6e32d511efdba6b
 2021-02-01 11:26:27 +00:00
Bill Yi
042aac48c9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id4a7507d0bc0efde48aeb3757074a257f6a8f169
 2021-02-01 01:30:24 +00:00
Muhammad Qureshi
b7c4df2e3f Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f66eb0cbfb1165bf8b0a6e82f1eaded59436780
 2021-01-30 03:19:36 +00:00
Muhammad Qureshi
109e3a5bc7 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f -s ours 
am skip reason: skipped by user muhammadq

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98bcb73f462edd54f2ed21b80a3f511f8325e68c
 2021-01-30 03:19:34 +00:00
Muhammad Qureshi
0992a32def Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev 2021-01-30 02:00:56 +00:00
TreeHugger Robot
6315368369 Merge "Only update native InputApplicationHandle once" into rvc-dev am: 274863f9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210344

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I878e10c352664d7ffb5c222071987b214b219cc2
 2021-01-30 01:02:13 +00:00
TreeHugger Robot
274863f9d5 Merge "Only update native InputApplicationHandle once" into rvc-dev 2021-01-30 00:06:35 +00:00
David Su
510ed38ebe Merge "framework-wifi-util-lib - set min_sdk_level to 30" into mainline-prod 2021-01-29 22:27:38 +00:00
TreeHugger Robot
9a3c3898f9 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5400eff5f048b5a10dcc926e5331211acc7d3dd1
 2021-01-29 22:10:30 +00:00
TreeHugger Robot
a297374f96 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I484faf2bfa16a82b32781b9afa6d0d2ca2bef8de
 2021-01-29 21:37:28 +00:00
TreeHugger Robot
06985dae13 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd0880df0f5c6a802a0275abf7fad619366e00e
 2021-01-29 20:59:55 +00:00
TreeHugger Robot
3efa9f7d5f [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16c5584e2d87de3b2baa5614b288ae3c3820a4a9
 2021-01-29 20:44:09 +00:00
TreeHugger Robot
aa11921d25 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081848d8e1fafcf2f0a29a5359a6cd0fef167cb9
 2021-01-29 20:43:59 +00:00
TreeHugger Robot
f5682c0332 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5eea1e2d925e7584cfa015ce3315b12dcc0c7cc
 2021-01-29 20:43:49 +00:00
TreeHugger Robot
a7026c2eca Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If24d458ab3361901dfb8c389938b296dc95dd45e
 2021-01-29 20:43:41 +00:00
TreeHugger Robot
589f538708 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 dca1c94faa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3a42027376c2e65eab1219c9791f6862cc30ca5
 2021-01-29 20:43:31 +00:00
TreeHugger Robot
72745aaf00 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8b63161c685780fecfaf080ee0a2d1129761a3e
 2021-01-29 20:42:17 +00:00
TreeHugger Robot
4a241c28a7 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6f48c363ab68ab2cb5773dfb04e637aaffb9789
 2021-01-29 20:41:56 +00:00
TreeHugger Robot
5d2fa81de2 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3f3273fb2f73fb206d7d686abe80b9b679e1e3e
 2021-01-29 20:41:32 +00:00
TreeHugger Robot
290cbce8e1 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours 
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1965d89c65d8aade99712ddda251a6e332eb3f2
 2021-01-29 20:41:11 +00:00
Alexander Dorokhine
b9653a95df Suppress [CallbackInterface] metalava rule for mainline modules. 
This rule is already suppressed for main framework code in
framework/Android.bp, but mainline uses a different set of metalava
flags.

Android API council says this is the right thing to do for libraries
which run only on Java 8+, which is true of all mainline modules and
framework code.

Bug: 172180369
Test: AppSearch BatchResultCallback now builds
Merged-In: If81cda012b4627c8018ae54a0f0932ee39d6fd96
Change-Id: If81cda012b4627c8018ae54a0f0932ee39d6fd96
 2021-01-29 17:30:38 +00:00
Miranda Kephart
8a2656d4b6 [DO NOT MERGE] Close screenshot process on user switched 
Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd15)
 2021-01-29 15:03:08 +00:00
David Su
fcfb54a4fc services.net-module-wifi - set min_sdk_level to 30 
Bug: 178711289
Test: compiles

Change-Id: I433c2a8c6511be8c4a5884e42ae67cb097d884bf
Merged-In: If0865d7c0bf3164911911ef2a1700bca3d7cc11f
 2021-01-28 20:31:52 -08:00
David Su
2cdda4c452 framework-wifi-util-lib - set min_sdk_level to 30 
Bug: 178711289
Test: compiles
Change-Id: I80b63d55c740ec5005d09d4c988cdc20dfa97d88
Merged-In: I1129f690b06e7da8b3b8bbd60ab82253d52e75f8
 2021-01-28 20:31:52 -08:00
TreeHugger Robot
47fb5ee20c Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev 2021-01-29 01:42:55 +00:00
TreeHugger Robot
3c4f0c4946 Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev 2021-01-29 01:42:55 +00:00
TreeHugger Robot
d7c5e63be3 Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev 2021-01-29 01:42:55 +00:00
TreeHugger Robot
35f36d2d4c Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev 2021-01-29 01:42:55 +00:00
TreeHugger Robot
06885a559e [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dd1c0934d2fed75281e3e72ca63ca7c14d1bc31
 2021-01-28 23:32:46 +00:00
TreeHugger Robot
a4e5fdf10a [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1217436408739f926bd3958df835fe9f281288b
 2021-01-28 23:15:54 +00:00
TreeHugger Robot
df0b2e9939 [automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours 
am skip reason: skipped by user chiuwinson

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I679f76f348dfc1d72eb42e3704faa8208409ef0c
 2021-01-28 22:53:40 +00:00
Beth Thibodeau
def75584a3 Limit maximum allowed size for a status bar icon 
Bug: 169255797
Test: atest StatusBarIconViewTest
Test: verified that app crashes instead of SysUI following repro steps
Change-Id: I66e3bb873841b5babfd522c82cea7bed361fc14c
(cherry picked from commit 4394595deb)
 2021-01-28 22:01:41 +00:00
TreeHugger Robot
f4a729180c Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev 2021-01-28 21:33:04 +00:00
Miranda Kephart
9908e1a145 [DO NOT MERGE] Close screenshot process on user switched 
Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd15)
 2021-01-28 18:49:29 +00:00
TreeHugger Robot
9b6399bea6 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-01-28 16:23:43 +00:00