Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
583,774 Commits 3 Branches 0 Tags
d0de93308b571aef79c8c5eb76c045d1ea7e1cdf
Commit Graph

583774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Chiang
d0de93308b Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 am: b145311a8d am: 3bff601a8a am: 3788ac124b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: If5f2440d3c7621bc9ce9260e5f7d0ad3b5d71d65
 2020-09-18 04:41:00 +00:00
TreeHugger Robot
80151b3765 [automerger skipped] Merge "Add telecom to priorityOnlyDndExemptPackages" into rvc-qpr-dev am: b4e06d0147 am: acead94428 -s ours 
am skip reason: Change-Id I798f1d968821e7d1b0a97b9b034c1ef0726f8242 with SHA-1 5e8202316b is in history

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

Change-Id: I28c164e5d061cac3e3a92cd429b81351185ea63f
 2020-09-18 04:37:46 +00:00
Yunfan Chen
9704a8c400 Merge "Remove remaining insets system UI flags in DisplayPolicy" 2020-09-18 04:35:10 +00:00
TreeHugger Robot
5064f90b54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 73489b9ccf -s ours am: 837b88446a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1b12742f56b1fe846a8536a6770d27feeb1678a
 2020-09-18 04:16:11 +00:00
TreeHugger Robot
50d8569353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 47c0c889db -s ours am: bba27dfebf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03380ab7fc79800f285eebdf6e534e2ff18cda0d
 2020-09-18 04:10:36 +00:00
Beth Thibodeau
7d18cadc5e [automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev am: c8f18d19a2 am: 11785386f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e28ffe0102fd70711a1a989b1a9fbd4912caaa6
 2020-09-18 04:06:42 +00:00
Beth Thibodeau
21f90e0d94 [automerger skipped] [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" am: f715910293 am: 48f5f05e91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ea58c74627673495382d2187732b804cd13ce41
 2020-09-18 04:06:38 +00:00
Paul Hu
9dab7e953e Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" into rvc-qpr-dev am: 8b9d40586b am: aed20efa42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12533920

Change-Id: Iff7cbae55a18e8e1c8072f2aa6c3c6b4db943d57
 2020-09-18 04:06:20 +00:00
Jakub Pawlowski
cc824d3c39 Merge "Bluetooth: log who changes adapter name" am: 78f92ef7fa am: 8e139a82cd am: b1f4504f56 am: 350b085cc8 am: c79ae51bd4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428568

Change-Id: I67465d7983d9705c0704d10dc83ca851f85219c9
 2020-09-18 04:05:59 +00:00
Gustav Sennton
c36577b2ff [automerger skipped] Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into rvc-qpr-dev am: 2f4d456c2c am: dba722b88c -s ours 
am skip reason: Change-Id I2f66273bd90e9bb220f799d8ab3b024637b33c24 with SHA-1 762e0f9a2e is in history

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

Change-Id: Iac26f64f05707f2da769c4961df8329aa6966f93
 2020-09-18 04:05:37 +00:00
Treehugger Robot
8f78267409 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: Ib554a97fd7293c872690407ca791482c1d4ad56e
 2020-09-18 03:56:01 +00:00
Lucas Lin
48e000d788 Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab am: ab666813e2 am: 1663ccb254 am: db771d24cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: I0401859afa1fcf4767827e4c2e536abf68a7f744
 2020-09-18 03:32:37 +00:00
Robert Chou
f8d921545b Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc am: 8e9f6c8db1 am: 53aa756a06 am: 7a38d00bc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: Idce0ee0328004bcc5bcf6b0d930d5d52b7d8ce85
 2020-09-18 03:22:10 +00:00
TreeHugger Robot
806bfa5649 Merge "Log if installers drop attribute installLocation" 2020-09-18 03:16:10 +00:00
TreeHugger Robot
8ba1eee05d [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-qpr-dev am: 792e2be0fd am: a8f4e86533 -s ours 
am skip reason: Change-Id I6dac60aac172a8fccf4b5671107b41c5c84ccd76 with SHA-1 f7b0d0e04e is in history

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

Change-Id: I6d71e5efbb606066532f7b67df9b5cc9ba4621ba
 2020-09-18 03:10:00 +00:00
TreeHugger Robot
4e1e30e7bb Merge "Add parsed package name to installer session" 2020-09-18 03:05:35 +00:00
TreeHugger Robot
05bf2962b0 Merge "Increase keyguard password maxlength to 500" into rvc-qpr-dev am: 119e662303 am: 98c23f82f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12601929

Change-Id: Iebbfafeca9b04245ac99ef1ec70f811152b3a7f7
 2020-09-18 03:01:00 +00:00
Amit Mahajan
4fbac1e7f0 [automerger skipped] Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f am: d397780a38 -s ours am: a23339f3b7 -s ours am: d1fdda86b4 -s ours 
am skip reason: Change-Id I626f871b64d50127feece80f018272e51ad1c66c with SHA-1 715073fc69 is in history

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

Change-Id: I71a835976b590275fa331784947ecc30bc011440
 2020-09-18 02:53:05 +00:00
Les Lee
c622a80155 Merge "wifi: Add SAP generation indication API" 2020-09-18 02:34:57 +00:00
Lyn Han
0e0ceb9de0 Merge "Resolve merge conflicts for BubbleLoggerImpl" 2020-09-18 02:15:52 +00:00
TreeHugger Robot
b735367f26 Merge "Camera: Clarify camera2 id usage when retrieving camcorder profiles" 2020-09-18 02:12:55 +00:00
Adam He
12cbc19d16 Merge "Refactor and simplify InlineFillUi and InlineSuggestionFactory." 2020-09-18 01:57:53 +00:00
TreeHugger Robot
e8e7191577 Merge "Suspend battery charging while PowerStatsLoadTest is running" 2020-09-18 01:57:41 +00:00
JW Wang
23082aef8b Merge "Remove #updateStoredSession (6/n)" 2020-09-18 01:51:02 +00:00
TreeHugger Robot
c89ecd7d89 Merge "Fixing gradle build for SystemUI" 2020-09-18 01:09:11 +00:00
Amit Mahajan
1ef3f98d53 Merge "Cache ITelephony service." 2020-09-18 00:35:47 +00:00
Adam He
6be74a57ab Refactor and simplify InlineFillUi and InlineSuggestionFactory. 
* Create InlineFillUiInfo to encapsulate the numberous arguments passed
into the factory.
* Combine CreateInlineSuggestions API for regular and augmented
autofill.

Bug: 162357598
Test: atest CtsAutoFillServiceTestCases
Change-Id: I64d5ca2aec510b9e04ebc3c499ca0029dc96925c
 2020-09-17 16:00:18 -07:00
Eugene Susla
271b9186a9 Merge "Add permission check to CDM dump" 2020-09-17 22:56:09 +00:00
Ivan Chiang
3788ac124b Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 am: b145311a8d am: 3bff601a8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: I3df68434989ee8231db6adf41a203526be5027ab
 2020-09-17 22:10:57 +00:00
Suprabh Shukla
97ec56f1a7 Remove alarms from mPendingNonWakeupAlarms 
While setting an alarm, we should remove any existing occurrences
of the same, but we were skipping on removing any past due non-wakeup
alarms.
In rare cases when a caller is spamming the alarm manager, we
might end up accumulating alarms inside mPendingNonWakeupAlarms that
count towards the per-uid limit of the caller, and may result in an
exception.

Test: atest FrameworksMockingServicesTests:AlarmManagerServiceTest
atest CtsAlarmManagerTestCases

Bug: 167645096
Bug: 130444055
Change-Id: I2d2b08019a3b3a1e63b60d3a6e2909db7b1a1864
 2020-09-17 21:59:17 +00:00
Hai Zhang
1ea73d6184 Merge "Revert "Revert "Make all permissions per-user.""" 2020-09-17 21:20:48 +00:00
Ady Abraham
41b5d5a764 Merge "Shared timeline plumbing" 2020-09-17 21:16:25 +00:00
TreeHugger Robot
acead94428 Merge "Add telecom to priorityOnlyDndExemptPackages" into rvc-qpr-dev am: b4e06d0147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12615932

Change-Id: Ie674a6ab2f32579ddec80c6926f25798975691a9
 2020-09-17 21:07:29 +00:00
Hall Liu
a471b1966e Merge "Update PhoneStateListener#onOutgoingEmergencySms" 2020-09-17 19:59:23 +00:00
TreeHugger Robot
b4e06d0147 Merge "Add telecom to priorityOnlyDndExemptPackages" into rvc-qpr-dev 2020-09-17 19:45:53 +00:00
Ivan Chiang
3bff601a8a Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 am: b145311a8d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: I1751238eb75a288c9f13a0c857a00c04e908d1f6
 2020-09-17 19:45:20 +00:00
Hangyu Kuang
f039189b02 Merge "transcoding: Add retry api." 2020-09-17 19:39:36 +00:00
Sunny Goyal
f709bd25d8 Fixing gradle build for SystemUI 
Test: Verified build locally
Change-Id: If850fd6381f1453814653c4feec85059cf788598
 2020-09-17 19:30:09 +00:00
TreeHugger Robot
837b88446a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 73489b9ccf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia142f4d6ca9199105537e0a612caff0fec9e30c9
 2020-09-17 19:13:50 +00:00
Ivan Chiang
b145311a8d Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: I80c2583f27d3376a065f93d985e832c99001536f
 2020-09-17 19:13:46 +00:00
TreeHugger Robot
bba27dfebf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 47c0c889db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I713063ecc9fc683aa15a334ec36a2a72dd2be879
 2020-09-17 19:13:18 +00:00
Beth Thibodeau
11785386f1 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev am: c8f18d19a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597796

Change-Id: I201e5d48c57dd38bb966c8aaf53999e082756468
 2020-09-17 19:12:29 +00:00
Beth Thibodeau
48f5f05e91 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" am: f715910293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597796

Change-Id: Ib12f9d769f6273849216678f7749c72172f3e179
 2020-09-17 19:12:14 +00:00
Alex Johnston
b461a4f3da Merge "Revert "Replace enforceXXX methods (managed profile)"" 2020-09-17 18:57:08 +00:00
TreeHugger Robot
73489b9ccf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:30:02 +00:00
Beverly
c384c930fd Add telecom to priorityOnlyDndExemptPackages 
telecom plays dialer's ringtone, so we allow them to play sounds when
DND is on in priority mode. We trust that telecom will abide by the DND
rules and exceptions (ie: checking for starred contacts)

Test: manual
Bug: 163525045
Change-Id: I798f1d968821e7d1b0a97b9b034c1ef0726f8242
Merged-In: I798f1d968821e7d1b0a97b9b034c1ef0726f8242
 2020-09-17 18:28:40 +00:00
TreeHugger Robot
47c0c889db Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:12:14 +00:00
Beth Thibodeau
c8f18d19a2 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev 2020-09-17 17:56:29 +00:00
Beth Thibodeau
f715910293 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" 
Revert "Allow user to block individual apps from resuming."

Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: I888079abc77f5bc22aefa19c2f7523bb9db05bf8
 2020-09-17 17:56:11 +00:00
Ivan Chiang
7a5e865a80 Merge "Revert "Ringtone uri should add type query"" am: 56da278127 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: Ia0de693ab6e40de6591ebf223ca9da177ae9735e
 2020-09-17 17:39:20 +00:00