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

1406 Commits

Author SHA1 Message Date
Xin Li
d31ee38811 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
 2020-12-02 00:38:58 -08:00
Hongming Jin
605dba983f Add owners for android accessibility team. 
Test: N/A

Change-Id: I82e06f2124fa9151447446879d939fb2522b2adb
 2020-11-30 10:32:29 -08:00
Baligh Uddin
2228195331 Merge "Revert "Add OWNERS block to facilitate in migration"" 2020-11-30 17:21:25 +00:00
Baligh Uddin
add50828c6 Revert "Add OWNERS block to facilitate in migration" 
This reverts commit 9e569671a3752c4edd95367f483355ad31fac8d4.

Reason for revert: atoms and associated protos have been migrated.  Removing migration block.

Change-Id: Ia1e4a73001ebc9509b8550c7957135172ce8938d
BUG: 167962588
Test: TH
 2020-11-30 15:46:34 +00:00
Jeffrey Huang
17df403e9e Move enums file to new directory 
Bug: 167962588
Test: m -j
Change-Id: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
Merged-In: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
 2020-11-25 16:14:08 -08:00
Baligh Uddin
9e569671a3 Add OWNERS block to facilitate in migration 
BUG: 167962588
Test: TH
Change-Id: Ia8cdeb0c2bd0e98d8d6b8a44f49d42ccd0d04908
 2020-11-22 14:59:22 +00:00
sqian
74207ec1fb Introduce new App Ops permission for 3rd-party InCallService 
This permission is intended to be used internally as a system App Ops permission, and let CompanionDeviceManager or RoleManager to grant with
users. If it is granted by user, the corresponding companion app has the ability to query the details of the ongoing calls, and also manage its life cycle.

Bug: 169595473
Test: atest ThirdPartyInCallServiceAppOpsPermissionTest
Change-Id: Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49
Merged-In: Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49
(cherry picked from commit 334ab546e46ff5916eb6239f98ee3462498e87c9)
 2020-11-09 21:00:55 +00:00
Nikita Iashchenko
ff64fd0f36 Import TLS handshake atom for Conscrypt 
Bug: 160345816
Test: m droid
Change-Id: I7ddf7626376bd649c8b10306d464b783cf16959b
Merged-In: I142a792c34dced6b0e27b867ed3a1d95249a5f7f
 2020-11-03 16:48:04 +00:00
Shuo Qian
e3edd0a3c3 Try to add AppOps Keys into Proto to unblock my project 
My code https://googleplex-android-review.git.corp.google.com/q/topic:%223rd-incall%22+(status:open%20OR%20status:merged),
 which is adding a proto enum for a new AppOps, is causing presubmit
 failure (https://android-build.googleplex.com/builds/tests/view?invocationId=I62800006309385464&redirect=http%3A%2F%2Fsponge2%2F8a607de5-e0c3-4349-b3c4-0ee397685e18&testResultId=TR55614315792892488).
I cannot check in my code because of this failure.

To solve this failure, one of the next step is:
adding AppOps 100-102 there

Test: Treehugger
Bug: 169595473
Change-Id: Ibd0f85575c9bc3d7aca9d5b011f1e5f0cbf960c1
Merged-In: Ibd0f85575c9bc3d7aca9d5b011f1e5f0cbf960c1
(cherry picked from commit 503ee6ad3be976c3a436a783cb4ee65169d92c16)
 2020-10-29 22:15:08 +00:00
Xin Li
986e6eeddf Merge ab/6749736 in stage. 
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
 2020-10-10 20:38:57 -07:00
Kevin Chyn
2fef428caa Merge "Add biometrics owners" am: ecea8deae9 am: b0db693fb2 am: 2d2124a26f am: 5914a15a52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440471

Change-Id: Ic35995ff9582c4c3c09005dad888f8cdfb7b6802
 2020-09-28 18:24:41 +00:00
Kevin Chyn
2d2124a26f Merge "Add biometrics owners" am: ecea8deae9 am: b0db693fb2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440471

Change-Id: Icc5f94c45eb6ff9f805087fca545c2f793c73bce
 2020-09-28 17:18:29 +00:00
Kevin Chyn
bb47cdba7b Add biometrics owners 
Test: Builds
Bug: 169459906
Change-Id: I45a1e2211477aa52c02cf884f38d09a1ab8494c5
 2020-09-27 18:26:53 -07:00
Adrian Roos
704eaaeea9 Merge "Add roosa to ONWERS" am: ee1693c4f8 am: cb4ed8dcc4 am: 0857ac2716 am: bf81503306 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438333

Change-Id: If9df4c8545011511aa400270dbfb9d8b10720a7b
 2020-09-25 17:14:22 +00:00
Adrian Roos
0857ac2716 Merge "Add roosa to ONWERS" am: ee1693c4f8 am: cb4ed8dcc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438333

Change-Id: Ideca46a51dc10255081acc8d8e3045e0039a320b
 2020-09-25 15:46:31 +00:00
Adrian Roos
ee1693c4f8 Merge "Add roosa to ONWERS" 2020-09-25 14:53:10 +00:00
Adrian Roos
702595c784 Add roosa to ONWERS 
Change-Id: I3b12aedc128c5acdd1856ba01e8e344b0349d26e
 2020-09-25 12:12:34 +02:00
Govinda Wasserman
6e8d9e5cb6 Merge "Adds Assistant Handles learning state to backed up settings" into rvc-qpr-dev am: 01c000eff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12656264

Change-Id: Id9a1336991a0745f62b33c85250c45cc0f66b4b9
 2020-09-23 17:41:15 +00:00
Govinda Wasserman
6c6e754f63 Adds Assistant Handles learning state to backed up settings 
This solves the issue where the device would forget the learned state
when restoring from a backup.

Test: Tested locally
BUG: 159807978
FIX: 159807978
Change-Id: Ia1d5926621c4b45402036aaf06cbab19c12869bd
Merged-In: Ia1d5926621c4b45402036aaf06cbab19c12869bd
 2020-09-23 02:18:28 +00:00
TreeHugger Robot
8940f10402 Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df580193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383606

Change-Id: I7421c1f07d89d1b7c5371c83ed8a94f7f4ae9c71
 2020-08-24 16:05:11 +00:00
Arc Wang
d631c648b3 Add a SettingsProvider key for Adaptive connectivity 
Adaptive connectivity is a feature to manage 5G connectivity
for better battery life.

Bug: 162871294
Test: compile
Change-Id: I719e44a29a54ee886e5d3a7180fd3ad9a7dff599
Merged-In: I719e44a29a54ee886e5d3a7180fd3ad9a7dff599
 2020-08-24 20:26:16 +08:00
Peiyong Lin
b18a2fccc3 Rename game driver to updatable driver. 
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.

Bug: b/164449016
Test: build
Change-Id: I787f97b4801dcc7b5ec2acd569a7ce284c9a1f18
 2020-08-14 10:44:59 -07:00
Peiyong Lin
7bc64bdf00 Use more inclusive terms. 
BUG: b/162288333
Test: N/A
Change-Id: Icd58adb5eb19395548f20bd9349639e84a0cce88
 2020-07-29 16:23:28 -07:00
Peiyong Lin
b967a4c381 Use more inclusive terms inside GraphicsEnvironment. 
Bug: b/162288333
Test: N/A
Change-Id: I2f1f13a892be0c8ff3f89e0ceabe39058390727d
 2020-07-27 23:57:50 -07:00
Rubin Xu
ac51bf8a40 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain 
This change includes the following commits that are related to
CertInstaller and KeyChain:

7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
 2020-07-15 15:50:14 +01:00
TreeHugger Robot
bec22864d7 Merge "Don't count proxied jobs toward scheduling limit." into rvc-dev am: 9994c816a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12122206

Change-Id: I8935806ef8c466be9283107dc33fe73698fabd80
 2020-07-13 18:22:23 +00:00
Kweku Adams
c6b55f33ac Don't count proxied jobs toward scheduling limit. 
1. Some API calls (such as SyncManager calls) can result in multiple job
schedule calls. Given that underlying implementation detail, we don't
count jobs scheduled via proxy towards the source app's schedule limit.
Calls using scheduleAsPackage for itself will still count.
2. Limit the number of times we log that a specific app has exceeded the
limit to once per minute.
3. Update the error message and documentation to help developers
identify what to do when they encounter the issue.

Bug: 160796417
Test: atest JobSchedulerServiceTest
Test: atest JobSchedulingTest
Change-Id: Ia682aa889ec2a26d373d0309e8c0324570f7d816
Merged-In: Ia682aa889ec2a26d373d0309e8c0324570f7d816
 2020-07-10 23:58:27 +00:00
Sarah Chin
b12ae89571 Merge "Add Setting for NR screen off indications" 2020-06-23 17:39:41 +00:00
Sarah Chin
957f0a5285 Add Setting for NR screen off indications 
Test: build
Bug: 154241884
Change-Id: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
Merged-In: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
 2020-06-22 16:15:03 -07:00
TreeHugger Robot
cd463e4191 Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: I75103ba087a2539c987a85b73976a9a0a77aa391
 2020-06-22 17:21:12 +00:00
TreeHugger Robot
06cfd49914 Merge "Correct the name of enum UserType item" into rvc-dev 2020-06-22 17:06:58 +00:00
lifr
5a2b5a7f14 Correct the name of enum UserType item 
Test: Run statsd_testdrive
Bug: 153942334
Change-Id: Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74
Merged-In: Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74
(cherry picked from commit ad14a26c2c971e7cc6f861293810e9a4a731cb8d)
 2020-06-22 17:51:56 +08:00
lifr
ad14a26c2c Correct the name of enum UserType item 
Test: Run statsd_testdrive
Bug: 153942334
Change-Id: Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74
 2020-06-22 14:34:50 +08:00
Frank Li
280471d6d1 Merge "Adding Network Tethering Metrics/atoms in the statsd" 2020-06-20 01:52:12 +00:00
TreeHugger Robot
c10dd8bbca Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: Ia5a8345f679b20f410857eef9227ceca7b573d94
 2020-06-19 22:55:14 +00:00
TreeHugger Robot
263c7f9bc1 Merge "Statsd notif logs: important conversations." into rvc-dev 2020-06-19 22:48:49 +00:00
Beth Thibodeau
7a2dfd3422 [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ie0520c407c27112a05049ef6627528e204ffdff2
 2020-06-19 22:40:39 +00:00
Will Brockman
3ec0934486 Statsd notif logs: important conversations. 
Adds an importance level for "important conversation" to the
notification posted and notification channel updated logs.

Bug: 155064930
Change-Id: Ib5a47aeb2da4d8614bfc778f3771479256220b23
Test: atest PreferencesHelperTest NotificationManagerServiceTest
Test: statsd_testdrive
 2020-06-19 16:55:02 -04:00
Beth Thibodeau
c1bc307bce [DO NOT MERGE] Support toggling resumption in Settings 
Moved setting so we can use Tunable:
adb shell settings put secure qs_media_resumption 1

If setting is changed, removes all existing resume players

Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: atest com.android.systemui.media

Change-Id: Iad056fbad4520cfe762d9e9f5ed62d38ea1117b1
 2020-06-18 23:58:11 +00:00
lifr
8d9850d392 Adding Network Tethering Metrics/atoms in the statsd 
Test: Run statsd_testdrive
Bug: 15192618
Change-Id: Ia0dc1dd45e006348c3856b483972a4ccd6048d05
Merged-In: Ia0dc1dd45e006348c3856b483972a4ccd6048d05
(cherry picked from commit 8abf3a7c23976340179e109e1b3a009737414bd1)
 2020-06-19 03:24:16 +08:00
Treehugger Robot
7e57780ddd Merge "Set min_sdk_version to be part of mainline modules" am: 7bca9bf7de am: e4fe4b211d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1336117

Change-Id: I5ee224d768e9958cf3321f13236b5ea473e33d66
 2020-06-18 17:18:10 +00:00
Frank Li
daa335dd66 Merge "Adding Network Tethering Metrics/atoms" into rvc-dev am: 53795ae7ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11877918

Change-Id: If7cf9571ae7554ed3e757446fdbc8341bd8b2007
 2020-06-18 05:04:23 +00:00
lifr
8abf3a7c23 Adding Network Tethering Metrics/atoms 
Test: Run statsd_testdrive
Bug: 153942334
Change-Id: Ia0dc1dd45e006348c3856b483972a4ccd6048d05
 2020-06-18 10:36:07 +08:00
Hyunyoung Song
9b806c2245 Merge "Add two more enums to LauncherState" into rvc-dev am: d53382b05d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876680

Change-Id: I795a4db555825cea63b97764ecef68ca3a106d41
 2020-06-17 16:13:15 +00:00
Hyunyoung Song
d53382b05d Merge "Add two more enums to LauncherState" into rvc-dev 2020-06-17 16:05:34 +00:00
Jooyung Han
6c8a51c9f6 Set min_sdk_version to be part of mainline modules 
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I9b630aabff01eb1dd5dc4c0f14517e6d1a914126
 2020-06-17 14:36:10 +09:00
Frank Li
fb5e5063f3 Merge "Adding NetworkStack Metrics/atoms" 2020-06-17 03:27:19 +00:00
Nikita Ioffe
2ea633314f Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: I0c5fc35f9251c3ffd43b43d63b7bfbbddf8d5061
 2020-06-16 20:31:04 +00:00
Nikita Ioffe
663727472a Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev 2020-06-16 20:17:29 +00:00
Hyunyoung Song
244abe21b6 Add two more enums to LauncherState 
Test: system image builds
Bug: 137777105

Change-Id: Ie383809b8d38dbaed8fd99e46a0cc712b1d202d7
 2020-06-16 09:34:26 -07:00