Commit Graph

73230 Commits

Author SHA1 Message Date
Jason Chiu
f53f622e76 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd am: bbbcb7ae68 am: addb0fa60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I1c785e341a903adaa78cc1e6640a262797369614
2020-06-20 03:51:56 +00:00
Jason Chiu
d9087a06ad Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05 am: 7c28e2c1cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Id62836f408bbf60045abb05d7f2cad3270043cd0
2020-06-20 03:51:35 +00:00
Jason Chiu
addb0fa60b Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd am: bbbcb7ae68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I02f5c155f5e383d2d4cf7d12bc31966565954a5a
2020-06-20 03:29:06 +00:00
Jason Chiu
7c28e2c1cf Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I05297cf55d085fc8da614fda650e0e7ab08e11cf
2020-06-20 03:28:58 +00:00
Jason Chiu
bbbcb7ae68 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I935d38b45d14252a0a76e048df9e2d7cf339bc35
2020-06-20 03:16:57 +00:00
Jason Chiu
6f8d8e3d05 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I4236bdb397c583d278e5b9c7f3f2def1827ae5a3
2020-06-20 03:16:51 +00:00
Jason Chiu
442de5c4dd Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I2c9b54011db4a9269f2cb01539ab5a793783c482
2020-06-20 03:04:39 +00:00
Jason Chiu
4a48011fba Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Iad6aac126e058bc6293d0587debb345506e7b643
2020-06-20 03:04:27 +00:00
Jason Chiu
468e567368 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I0023e814f8bf3b86ddbcc879427efd5d4038f700
2020-06-20 02:52:16 +00:00
Jason Chiu
5381571891 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I8f016042af7f617ba0cebda0aab717912a7e9225
2020-06-20 02:51:56 +00:00
Jason Chiu
4b6e900e64 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev 2020-06-20 02:39:21 +00:00
Kevin Chyn
8204cb8c96 Merge "Remove setActiveUser together with frameworks/base (see 12/n)" am: 95e05d8d07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11885448

Change-Id: Ib5e9bc25d0210442b0b5fc048283fb77516a835f
2020-06-20 01:04:19 +00:00
Kevin Chyn
95e05d8d07 Merge "Remove setActiveUser together with frameworks/base (see 12/n)" 2020-06-20 01:02:24 +00:00
Automerger Merge Worker
ad87dc2470 Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp am: f2ebba9025 am: 851b51308f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I6f2dd328de8ff8de041d8b2b435c56a1c1e98053
2020-06-19 23:41:36 +00:00
Beth Thibodeau
d42c216746 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 am: bd62fc7dae -s ours am: 67126bdb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I6d53710e117fe0b7144695ebd54dd50e768bdc5e
2020-06-19 23:41:34 +00:00
Automerger Merge Worker
ca4840b6d9 Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc am: ca5ce305af am: a28c2c57dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I9714a61ca301d856a0ee96fa90407d1003b96c3c
2020-06-19 23:41:11 +00:00
Beth Thibodeau
950cbe0027 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 am: 941a4369d8 am: 87441e00b9 -s ours am: 57b516cddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ib67b24fa0ee60c5d925ba6f4d4eaafcb8028eb5a
2020-06-19 23:41:09 +00:00
Beth Thibodeau
bfde4e2e14 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: 8b9b226bcf am: 2f749ba768 -s ours am: 090802c1fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ibd875303fca068c333b2e846ebac8c6a2624da41
2020-06-19 23:40:03 +00:00
Beth Thibodeau
64f8233017 [automerger skipped] [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: c30c0c381c am: e92c41ee14 -s ours am: 91d1e64d5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I06b5a0c774b2e38d344b8b76b0d23a32b6b80a25
2020-06-19 23:40:01 +00:00
Automerger Merge Worker
851b51308f Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp am: f2ebba9025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Iaf9258d43189a94ce16eccf4bdff12006aafc3a7
2020-06-19 23:18:39 +00:00
Beth Thibodeau
67126bdb74 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 am: bd62fc7dae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I0d76ca4f1a0e08fbe0a3e356d6b439c2fecc0128
2020-06-19 23:18:37 +00:00
Automerger Merge Worker
a28c2c57dd Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc am: ca5ce305af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I33aad3b30406b95a3cf5fce3a4c019702a5b8c56
2020-06-19 23:16:35 +00:00
Beth Thibodeau
57b516cddc [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 am: 941a4369d8 am: 87441e00b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2bed6465f6ad7fd70ac18eb1ecc12488683c4cc3
2020-06-19 23:16:33 +00:00
Beth Thibodeau
090802c1fd [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: 8b9b226bcf am: 2f749ba768 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I016ffc0a718e14fb1b4c79588befebeb7a6aa9f0
2020-06-19 23:14:47 +00:00
Beth Thibodeau
91d1e64d5c [automerger skipped] [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: c30c0c381c am: e92c41ee14 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I6c02289fc7911d226e37e4f3237e166ed1c4fa14
2020-06-19 23:14:44 +00:00
Automerger Merge Worker
f2ebba9025 Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: 44ce07125a
2020-06-19 22:57:06 +00:00
Automerger Merge Worker
ca5ce305af Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I605fa7f7c2225713a267a4e60f26461a91e536d9
2020-06-19 22:56:53 +00:00
Beth Thibodeau
87441e00b9 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 am: 941a4369d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I7e796e5e1b757d90d8f42ffe4230c3ff5e156db7
2020-06-19 22:56:50 +00:00
Beth Thibodeau
bd62fc7dae Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I0ea0cf9d615041521a5bdbe2de483c8d94cec294
2020-06-19 22:56:49 +00:00
Beth Thibodeau
ae0cf1d24b [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: 44ce07125a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I349e8fc01405d897a9219dd51118d7cf432e5a4a
2020-06-19 22:56:46 +00:00
Beth Thibodeau
2f749ba768 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: 8b9b226bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2c732e309e17767ce72edcd9605cb978c3aa2e76
2020-06-19 22:55:39 +00:00
Beth Thibodeau
e92c41ee14 [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: c30c0c381c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I59ea65df35ecc811e22dc57165982634b8806a7a
2020-06-19 22:55:36 +00:00
Automerger Merge Worker
0701bcefbc Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp
* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: a648d121b7
2020-06-19 22:44:12 +00:00
Beth Thibodeau
941a4369d8 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Idd424e240102e9bf2c096711a76d7b60a54884af
2020-06-19 22:44:00 +00:00
Beth Thibodeau
26c5f5082f [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: a648d121b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I27e4dc2c479259ec7d0ef5797f2a773d6b22baf9
2020-06-19 22:43:58 +00:00
Beth Thibodeau
8b9b226bcf Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I02078c493b6d952b5b52d7accd5b248c77d4e234
2020-06-19 22:43:47 +00:00
Beth Thibodeau
c30c0c381c [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2b9690779b8cf6f5e6b8ae6c6dc6f428fb55c3bf
2020-06-19 22:43:44 +00:00
Beth Thibodeau
e9691bdc94 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Iad23f9254826d04f5b8c7f3ff22fa0dc780a27b9
2020-06-19 22:41:18 +00:00
Beth Thibodeau
44ce07125a [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I90c457110b1bd444e08894560fccba483e2699f9
2020-06-19 22:41:16 +00:00
Beth Thibodeau
5e6f05a533 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ib4dfa5a23c490651c0bc540866f4f99e77b70c6d
2020-06-19 22:40:42 +00:00
Beth Thibodeau
a648d121b7 [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ifed5f6e94045c09bcb5009827c24e668a11ac0a2
2020-06-19 22:40:39 +00:00
Beth Thibodeau
3ef895694d Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2a1b2ee94f990485cf8f80b98daec71241eca000
2020-06-19 22:40:27 +00:00
Beth Thibodeau
43834d78ff [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev 2020-06-19 22:26:59 +00:00
TreeHugger Robot
2871652b7c Merge "Add BatteryStatusFeatureProvider" am: 992d31cd03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11624552

Change-Id: I70530fecd373dbc4dcad57c88354ae5d43c26b70
2020-06-19 14:18:07 +00:00
TreeHugger Robot
992d31cd03 Merge "Add BatteryStatusFeatureProvider" 2020-06-19 14:02:13 +00:00
TreeHugger Robot
dacbe4cd63 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 3015d09885 am: 207d0a0af5 am: 0fe5efacda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I4acd08cdcd002534be7dbab324becae752dbd921
2020-06-19 13:42:54 +00:00
TreeHugger Robot
583a707b5d Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5 am: 16c66d916d am: fecc48bf53 am: d3cf5eb03d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Iac1962b24264d541e7594c935e62f2a373f0d241
2020-06-19 13:42:13 +00:00
TreeHugger Robot
682376c2aa Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd am: 01d0ea7443 am: c4471d716b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Ia976262684cd04e8dc33badcab153291ce7ed179
2020-06-19 13:41:19 +00:00
TreeHugger Robot
0fe5efacda Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 3015d09885 am: 207d0a0af5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I151f59004f19a4e3120202ef29f468585809d7c3
2020-06-19 13:29:29 +00:00