Commit Graph

586487 Commits

Author SHA1 Message Date
TreeHugger Robot
eb615feeaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours am: 7a11b64a09 -s ours am: f8d1546611 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib12e1cb2b151263eff0d7e8ad1b5b50946688d89
2020-10-07 08:18:24 +00:00
David Su
d035a3d1d5 [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: 3c8124a242 -s ours am: 63549d1837 -s ours am: 0bf831141b -s ours am: 65a917dce9 -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/+/12729621

Change-Id: Ic0fb69b7e4a208de3f84dfbc2d8b83e9078c73eb
2020-10-07 08:17:58 +00:00
wilsonshih
c98a932f19 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: 5d67607771 am: a4f3ed14d5 am: 6c1cbf2ddd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I77eba89327fd97246efec8d05f21f84b75b0ef0a
2020-10-07 08:17:22 +00:00
wilsonshih
aa0b7dffa3 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94 am: b180f6990a am: 43e56f6ad8 am: cb27cd9048
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

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

Change-Id: Ic764e1f7a42787db79121db180d69ed6a572fde4
2020-10-07 08:16:49 +00:00
David Su
a290444837 [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: 3c8124a242 -s ours am: 63549d1837 -s ours am: 0a8b94cedf -s ours am: 5c159ec6d4 -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/+/12729621

Change-Id: I44f628875ba51bdde92c9d4ae4f81b4cffb97416
2020-10-07 08:16:33 +00:00
wilsonshih
745712b212 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: 5d67607771 am: 74e82a7f5c am: 91c547ae5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: Ieafbdfe9ad85aad820d74b0e1a03f2762a41815d
2020-10-07 08:15:13 +00:00
wilsonshih
bf0674ef5b Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94 am: b180f6990a am: 89685e6612 am: 5ccb0abb1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

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

Change-Id: Id0a57c4b1efa4e07d2e6927720c3a797eadddaec
2020-10-07 08:13:52 +00:00
Nathan Harold
88f8a4b6a5 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours am: e4d4916078 -s ours am: a63442f285 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25b34764ce4c9ba4baa91c2bbed270d5c76b689b
2020-10-07 08:13:26 +00:00
Nathan Harold
2ca87aed5b [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -s ours am: 606869a99c -s ours am: fe94fb392d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia631adc0f5af0745a27f71d5b3c29bf264de2fbc
2020-10-07 08:13:09 +00:00
Nathan Harold
692dd19846 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours am: 7510b01340 -s ours am: 3b923b728f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e2fc73ca6d56254c969eeb602303fdf9e589955
2020-10-07 08:10:42 +00:00
Nathan Harold
c96186fc29 [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -s ours am: 410f455b2b -s ours am: 34fd4ca30f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d186980257238806baad4aebb7bf420b21e05da
2020-10-07 08:10:38 +00:00
Rhed Jao
d03db99731 Merge changes from topic "intent_extra_automatic"
* changes:
  Send extra when automatically removing packages (2/2)
  Send extra when automatically removing packages (1/2)
2020-10-07 08:06:24 +00:00
TreeHugger Robot
f8d1546611 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours am: 7a11b64a09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ff151d554f4b3fa3e58239a75c72064ee80854a
2020-10-07 08:04:36 +00:00
David Su
65a917dce9 [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: 3c8124a242 -s ours am: 63549d1837 -s ours am: 0bf831141b -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/+/12729621

Change-Id: Ibb3fb00bb1f1db2266203e3b3ba3cf36f69bb468
2020-10-07 08:01:46 +00:00
wilsonshih
6c1cbf2ddd Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: 5d67607771 am: a4f3ed14d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: Ibbeb00af6046ca54850a44ceaafe1826cb7493b8
2020-10-07 08:01:22 +00:00
wilsonshih
cb27cd9048 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94 am: b180f6990a am: 43e56f6ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

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

Change-Id: Ie53fbb7d68bbe8fb3862d7d31181c1e4a9224c37
2020-10-07 08:00:36 +00:00
David Su
5c159ec6d4 [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: 3c8124a242 -s ours am: 63549d1837 -s ours am: 0a8b94cedf -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: I85587a6ea495b78a69a24110f55ba3511507ca25
2020-10-07 07:59:12 +00:00
wilsonshih
91c547ae5c Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: 5d67607771 am: 74e82a7f5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

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

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

Change-Id: I668cb067bd88d30c810a327fa954caf6ff2e7eaf
2020-10-07 07:58:10 +00:00
Nathan Harold
a63442f285 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours am: e4d4916078 -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 81bab8b849 is in history

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

Change-Id: I3092e00e2f64a4b13ff641f6e855883fcd55f35c
2020-10-07 07:53:22 +00:00
Nathan Harold
fe94fb392d [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -s ours am: 606869a99c -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 81bab8b849 is in history

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

Change-Id: Ifbf45eda5e525e870ade66f3077b5a033d3de2f0
2020-10-07 07:53:17 +00:00
TreeHugger Robot
7a11b64a09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09015d5734c7aecd37c6803f5954d4b4d0622af0
2020-10-07 07:52:22 +00:00
David Su
391bd7bf66 [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: 3c8124a242 -s ours am: ed654d8291 -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: I056d4819ab0626afc8484f40d7cdbcfaabd5756a
2020-10-07 07:48:56 +00:00
David Su
0bf831141b [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: 3c8124a242 -s ours am: 63549d1837 -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: I4fe6fa8db34677b9f7b03338f6d26fcfaf69280d
2020-10-07 07:48:55 +00:00
wilsonshih
905883e986 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: e856d08ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

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

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

Change-Id: Iffc161ee8da16e9b61246d4c9274e330b98748c6
2020-10-07 07:48:09 +00:00
Automerger Merge Worker
8713ece008 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94" into mainline-prod am: b80c8788c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

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

Change-Id: Ib578f1656e41abdefe72ecec39c064eb84f6cfac
2020-10-07 07:47:57 +00:00
David Su
0a8b94cedf [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: 3c8124a242 -s ours am: 63549d1837 -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: I28289ad8ba125f9a22a77b306d3648bd74dd01bd
2020-10-07 07:47:42 +00:00
wilsonshih
81a06e1d88 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94 am: 1100e865c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I3d10d7535e022e0663b1b0d4ede5dc0519bc1eb3
2020-10-07 07:47:38 +00:00
Nathan Harold
3b923b728f [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours am: 7510b01340 -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/+/12664597

Change-Id: Ia86139d6cc2161311470236022fe5f9c98fafc8e
2020-10-07 07:47:34 +00:00
Nathan Harold
34fd4ca30f [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -s ours am: 410f455b2b -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/+/12664597

Change-Id: I54fd12f082fb8e4081f2d7eb96a20ba80fb71f9e
2020-10-07 07:47:27 +00:00
Nathan Harold
e4d4916078 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -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/+/12664597

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

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

Change-Id: If6c8a865ee8020fb7f4c103fb4f0a10a32255615
2020-10-07 07:47:18 +00:00
Nathan Harold
606869a99c [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -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/+/12664597

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

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

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

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

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

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

Change-Id: I51b87322be3b23689d3d538c105ed598c16b83b7
2020-10-07 07:46:43 +00:00
Nathan Harold
7510b01340 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -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/+/12664597

Change-Id: I629ac86721649bd8dd2682ca80e226dbd8548131
2020-10-07 07:45:56 +00:00
Nathan Harold
410f455b2b [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -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/+/12664597

Change-Id: I53d8b4da80048e9d5453b8b28f3eb31ebea30304
2020-10-07 07:45:54 +00:00
TreeHugger Robot
9ade8130a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 07:07:04 +00:00
Riddle Hsu
faf7e4a05b Merge "Fix test of wait-for-window-on-boot if wallpaper is disabled" 2020-10-07 06:26:51 +00:00
Ivan Chiang
687936786d Merge "Audio.Artists.Albums implements BaseColumns in MediaStore" 2020-10-07 05:19:13 +00:00