Commit Graph

586338 Commits

Author SHA1 Message Date
TreeHugger Robot
aade3bc068 Merge "Add Canvas#drawGlyphs" 2020-10-06 18:58:54 +00:00
Collin Fijalkovich
efc301a844 Merge "Disallow overlays for ResolverActivity" 2020-10-06 18:52:08 +00:00
TreeHugger Robot
53ba25661c Merge "Fix failing cts tests" 2020-10-06 18:46:54 +00:00
TreeHugger Robot
402534a343 Merge "Notify AppOps when notifications are [un]blocked for an app." into rvc-qpr-dev am: b914950d90 am: bc6162198a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12766705

Change-Id: If4b2bc5e24828870b1e80137da27ab547c3bd98f
2020-10-06 18:37:09 +00:00
Chris Tate
514705d6dd Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: b7c896bef2 am: 8190e4f7b0 am: e303489e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: I4b3152da573bf258baede270dd09311d322a2079
2020-10-06 18:36:58 +00:00
Chris Tate
9fd2756ca6 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 67c0cd04bf am: bdb0d6e363 am: 43c8c48e39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I52faef28da0a048572debee14fcf0e8fee59ce81
2020-10-06 18:36:43 +00:00
Nathan Harold
ed40a6c1e7 [automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae am: a76dee4397 -s ours am: 2b9cdbf9dd -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

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

Change-Id: I8cc5d5cf6af39d61d887e04017574cd0c97ef0a8
2020-10-06 18:36:33 +00:00
Chris Tate
e3faeada08 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: b7c896bef2 am: d18824ca39 am: 55b78a40eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: Ia482cbd2f7e3cc4992e0ff78469289ffe021fdf4
2020-10-06 18:36:14 +00:00
Chris Tate
00ba111862 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 67c0cd04bf am: a9e50438aa am: e2296e4941
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I83e8fe380878984bab2e8c1bba82de1052982be0
2020-10-06 18:35:56 +00:00
Nathan Harold
5005fc82a8 [automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae am: 9a34dd689c am: e66c1f7e5c -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

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

Change-Id: Idb51634ab5e3e490ac6aeb5b23d14558ccea0cee
2020-10-06 18:35:19 +00:00
Tyler Gunn
d4a830a2f8 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122 am: 7b4ee3d58f am: e1c853be71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I5bcec14df81f74b913439c98074afee2534862e7
2020-10-06 18:34:59 +00:00
TreeHugger Robot
bc6162198a Merge "Notify AppOps when notifications are [un]blocked for an app." into rvc-qpr-dev am: b914950d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12766705

Change-Id: Id3ff090c8cbf6f356e84acfd45d791c0d95b474a
2020-10-06 18:34:44 +00:00
Chris Tate
e303489e9a Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: b7c896bef2 am: 8190e4f7b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: Id0b3b39a6f0f645934936a1376dd6ccdd503e5a9
2020-10-06 18:34:33 +00:00
Chris Tate
43c8c48e39 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 67c0cd04bf am: bdb0d6e363
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I481f3f5f1073f164a9320052add5a7045eaf7e2c
2020-10-06 18:34:15 +00:00
Nathan Harold
2b9cdbf9dd [automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae am: a76dee4397 -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

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

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

Change-Id: I19bc395f02409c21478525766af3dfdde222aaa1
2020-10-06 18:28:08 +00:00
Amit Mahajan
95e06eec89 Merge "Expose getSmsCapacityOnIcc()" 2020-10-06 18:13:23 +00:00
TreeHugger Robot
b914950d90 Merge "Notify AppOps when notifications are [un]blocked for an app." into rvc-qpr-dev 2020-10-06 17:56:27 +00:00
Prameet Shah
0fc2997333 Notify AppOps when notifications are [un]blocked for an app.
Bug: crbug.com/934581
Bug: 129992781
Test: atest NotificationManagerServiceTest NotificationManagerTest
Test: Verified that blocked apps stay blocked on Android on ChromeOS.
Change-Id: Ibb57d295a1c4345d0acc514cbfe9994f8184cc9d
(cherry picked from commit 49d1a012b6)
2020-10-06 17:56:02 +00:00
Chris Tate
55b78a40eb Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: b7c896bef2 am: d18824ca39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: If94a0b611e7fe586c88843d7abfc9fed5a4e4240
2020-10-06 17:52:22 +00:00
Chris Tate
e2296e4941 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 67c0cd04bf am: a9e50438aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I710f724461bea66819eb71dd257b67fa40bd7df4
2020-10-06 17:51:31 +00:00
Nathan Harold
e66c1f7e5c Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae am: 9a34dd689c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: Iae5b2018a7765647953cb2769daf7ca246edfed6
2020-10-06 17:49:43 +00:00
Tyler Gunn
e1c853be71 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122 am: 7b4ee3d58f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

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

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

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

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

Change-Id: I8154f7a22446abca53fe49f3b978bfc90289e2f5
2020-10-06 17:44:31 +00:00
Nathan Harold
e5ba3fd119 [automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: 1c3a84f72b -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 4e0c7d16fd is in history

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

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

Change-Id: I6ed5d7d652d73ad01f5213500c5dac71dca8389c
2020-10-06 17:44:24 +00:00
Nathan Harold
9a34dd689c Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: I6f2f6ce14f2aa62f3b0034b19852426b53239d96
2020-10-06 17:44:09 +00:00
Nathan Harold
a76dee4397 Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: I971edba86ffcd19642f6da7613af6b6c371c2536
2020-10-06 17:44:03 +00:00
Eugene Susla
65d966e1d1 Merge "Fix codegen for wildcards in type args" 2020-10-06 17:15:31 +00:00
Chris Tate
c162886a3b Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

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

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

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

Change-Id: Iab51ff4dddfb51fcc6f9c4a974751df0c307b1ca
2020-10-06 17:01:08 +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
Tyler Gunn
7b4ee3d58f Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I6e6282829bcb4c3a637a5e1a4bbc2a12644a33d2
2020-10-06 16:57:17 +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
Nathan Harold
1c3a84f72b Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: If17063ae86087f1c59f493d6ad8ebcc6af55a494
2020-10-06 16:56:19 +00:00
Nathan Harold
c96eba62ae Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

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

Change-Id: Iea4f148d24c3976492c33818894fc11e8a44c71a
2020-10-06 16:55:53 +00:00
Mat Bevilacqua
2c4b946f05 Fix failing cts tests
On devices where certain PowerStats HAL data is unavailable the data
logger in PowerStatsService is disabled.  Check for null before
attempting to write the data to incident reports.

Bug: 168528724
Test:  Verified tests pass on devices with and without necessary
PowerStats HAL data.

Change-Id: I41b4e75ff673e4c3874c1ef6041d0a0b8102aa16
2020-10-06 09:47:33 -07:00
Chris Tate
e174ab0148 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev 2020-10-06 16:42:56 +00:00
Chris Tate
985f7b1d53 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev 2020-10-06 16:42:48 +00:00
Tyler Gunn
0c1a841122 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I6277cd5b2fc432dcf8aeefe0088c5ba25095f300
2020-10-06 16:35:38 +00:00
Nathan Harold
21a1916717 Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev 2020-10-06 16:30:33 +00:00
David Su
a3e52bf4e4 Merge "Migrate existing Build.VERSION.SDK_INT checks to SdkLevelUtil" 2020-10-06 16:15:18 +00:00
Tyler Gunn
2046a9dced Merge "Make android.telecom.action.POST_CALL a protected broadcast." 2020-10-06 16:12:23 +00:00
TreeHugger Robot
0572a76bc1 Merge "Addressing API review comments." 2020-10-06 15:24:53 +00:00