OSDN Git Service
Chih-Wei Huang [Mon, 20 May 2019 09:35:01 +0000 (17:35 +0800)]
Merge tag 'android-8.1.0_r64' into oreo-x86
Android 8.1.0 Release 64 (OPM8.190505.001)
android-build-team Robot [Wed, 13 Mar 2019 20:14:45 +0000 (20:14 +0000)]
Merge cherrypicks of [
6714499,
6716593,
6716594,
6716595,
6716596,
6716597,
6716977,
6718226,
6717773,
6716978,
6717663] into oc-m8-release
Change-Id: I756a59ef60afe0e4b8af1139f65cb3e48ba1db78
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit
9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
(cherry picked from commit
95d0fb7f4911403844666632ece42467f60ad753)
Chih-Wei Huang [Fri, 21 Dec 2018 09:18:58 +0000 (17:18 +0800)]
Merge tag 'android-8.1.0_r53' into oreo-x86
Android 8.1.0 release 53
android-build-team Robot [Fri, 7 Dec 2018 21:43:33 +0000 (21:43 +0000)]
Merge cherrypicks of [
5745882,
5746123,
5746124,
5746125,
5745544,
5745819,
5746700,
5745883,
5745545,
5746720,
5746344,
5745884,
5745885,
5745886,
5746740,
5746741] into oc-m8-release
Change-Id: Idd136bf9d0c74e54e06640a2f3aac67aa0baf8a4
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
(cherry picked from commit
04f1e38dc3af5b79849be07f31235ad8c1b20574)
Chih-Wei Huang [Tue, 9 Oct 2018 13:45:15 +0000 (21:45 +0800)]
Merge tag 'android-8.1.0_r48' into oreo-x86
Android 8.1.0 release 48
android-build-team Robot [Tue, 11 Sep 2018 23:09:07 +0000 (23:09 +0000)]
Merge cherrypicks of [
4995494,
4995495,
4995496,
4995497,
4997652,
4997881,
4997052,
4997883,
4995518,
4997653,
4997654] into oc-m8-release
Change-Id: I4b906acfd035460b5456df904cfee503387f5c5a
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
(cherry picked from commit
ff171eff8ea2e65e3f400cf5cb6ce025402381ce)
Chih-Wei Huang [Mon, 10 Sep 2018 16:18:38 +0000 (00:18 +0800)]
Merge tag 'android-8.1.0_r46' into oreo-x86
Android 8.1.0 Release 46 (OPM6.171019.030.K1)
Conflicts:
AndroidManifest.xml
res/values-es/strings.xml
res/values-km/strings.xml
android-build-team Robot [Thu, 16 Aug 2018 01:24:53 +0000 (01:24 +0000)]
Merge cherrypicks of [
4787660,
4787680,
4787071,
4787700,
4787592,
4787701,
4787720,
4787721,
4787072,
4787073,
4787074,
4787075,
4787076,
4787077,
4787740,
4787760,
4787722,
4787723,
4787724,
4787725,
4787726,
4787727,
4787728,
4787729,
4787730,
4787731] into oc-m8-release
Change-Id: I93908c62640731c398f6676b25902f05fd070eb9
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit
fff37ccb31d2b058b1bb2092ac55d88d6224a23e)
android-build-team Robot [Fri, 10 Aug 2018 20:32:40 +0000 (20:32 +0000)]
Merge cherrypicks of [
4741663,
4741664,
4741665,
4741666,
4743080,
4743081,
4743082,
4743083,
4741262,
4741263,
4741264,
4741265,
4741266,
4741667,
4743084,
4741242,
4741243,
4741741,
4741742,
4741743,
4741744,
4741822,
4743085,
4741668,
4741338,
4743055,
4743056,
4743070,
4743073,
4743075,
4743076,
4743078,
4743079,
4743161,
4743162,
4743164,
4743165,
4743167,
4743168,
4743169,
4743170,
4741681,
4741682,
4741683,
4741684,
4741685,
4741686,
4741687,
4741688,
4741689,
4741690,
4741691,
4741692,
4741693,
4741694,
4741695,
4741696,
4741697,
4741698,
4741699,
4743240,
4743241,
4743242,
4743243,
4741745,
4741823,
4741824,
4741825,
4741267,
4741268,
4743244,
4743280,
4743281,
4743224,
4743203,
4743204,
4743205,
4741746,
4741747,
4743245,
4741826,
4741827,
4741828,
4741829,
4741748,
4741749,
4741750,
4743233,
4743282,
4741244,
4741245,
4741246,
4741247,
4743206,
4743207,
4743208,
4743209,
4743210,
4743211,
4743212,
4743213,
4743214,
4743215,
4743216,
4743217,
4743218,
4743219,
4743360,
4743361,
4743362,
4743363,
4743364,
4743365,
4743366,
4743367,
4743368,
4743369,
4743370,
4743371,
4743372,
4743373,
4743374,
4743375,
4743376,
4743377,
4743283,
4743284,
4741830,
4742501,
4743246,
4743086,
4743087,
4743378,
4743379,
4741751] into sparse-
4749909-L04200000199131547
Change-Id: I3054f66972baf0c1123b8f3557487b3f362ca05e
Bill Yi [Mon, 18 Jun 2018 23:45:33 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iaade42044ade2bd9bc5fddf49f913fb869d0bd3e
(cherry picked from commit
ef6e86d04d1c8e1dd1451785a9c4c7b58a15002f)
Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]
Delete obsolete activity alias for dev settings
This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.
Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes:
92497653
Test: manual
(cherry picked from commit
0e1393ae8cac712bb56b51061a18885dae074038)
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
Bug:
72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
(cherry picked from commit
e36ca3e96d8c014d39f6ffa377f5e5fc69e1f4c5)
android-build-team Robot [Fri, 3 Aug 2018 19:21:30 +0000 (19:21 +0000)]
Merge cherrypicks of [
4691111,
4689862,
4690575,
4690576,
4690577,
4690578,
4689866,
4689868,
4689869,
4689870,
4691132,
4689456,
4689963,
4691133,
4691134,
4691156,
4691157,
4691159,
4691161,
4690581,
4689964,
4689460,
4691112,
4690582,
4690583,
4691165,
4691166,
4691167,
4691168,
4691169,
4691170,
4691211,
4691212,
4691213,
4691214,
4691215,
4691216,
4691217,
4691218,
4691219,
4691232,
4691233,
4691234,
4691235,
4691236,
4691237,
4691238,
4691239,
4691240,
4691241,
4691243,
4691245,
4691247,
4691249,
4691250,
4691291,
4691292,
4691293,
4691294,
4691295,
4691296,
4691255,
4689476,
4689477,
4689478,
4691223,
4691224,
4691136,
4689479,
4689480,
4691137,
4691225,
4691226,
4691227,
4691371,
4691228,
4691328,
4689967,
4691138,
4691139,
4691140,
4691433,
4689968,
4689969,
4691395,
4691230,
4691297,
4691298,
4691299,
4691300,
4691396,
4691397,
4691398,
4691399,
4691400,
4691401,
4691402,
4691403,
4691404,
4691405,
4691406,
4691407,
4691408,
4691409,
4691410,
4691471,
4691472,
4691473,
4691474,
4691475,
4691476,
4691477,
4691478,
4691479,
4691480,
4691481,
4691482,
4691483,
4691484,
4691485,
4691486,
4691487,
4691488,
4691143,
4691144,
4691511,
4691113,
4689482,
4691533,
4691145,
4691146,
4691147,
4691148,
4691536] into sparse-
4732991-L01200000196794104
Change-Id: I7e47dfb36fdf8099e8f502220b2d6482f6a94c10
Bill Yi [Mon, 18 Jun 2018 23:35:44 +0000 (16:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2a8276d1699633ee842854a0085d149eb6845a7d
(cherry picked from commit
9d6784140b0b4e6dc4ca649b9948b5c446a9e382)
Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]
Delete obsolete activity alias for dev settings
This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.
Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes:
92497653
Test: manual
(cherry picked from commit
0e1393ae8cac712bb56b51061a18885dae074038)
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
Bug:
72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
(cherry picked from commit
e36ca3e96d8c014d39f6ffa377f5e5fc69e1f4c5)
Chih-Wei Huang [Thu, 14 Jun 2018 09:13:42 +0000 (17:13 +0800)]
Merge tag 'android-8.1.0_r33' into oreo-x86
Android 8.1.0 release 33
Chih-Wei Huang [Thu, 14 Jun 2018 08:38:40 +0000 (16:38 +0800)]
Allow users to turn on or off Android-x86 statistics
Chih-Wei Huang [Fri, 30 Mar 2018 09:40:06 +0000 (17:40 +0800)]
Add Android-x86 dashboard
Add an option to enable or disable native bridge.
More options will be added in the future.
android-build-team Robot [Wed, 21 Mar 2018 21:23:49 +0000 (21:23 +0000)]
Snap for
4657601 from
8b10be2eeb86c923f1b684baf8526ea08567b10a to oc-m4-release
Change-Id: I33c9892bd7c6f5780ab27fc4182c722bb0468b50
android-build-team Robot [Thu, 15 Mar 2018 16:58:07 +0000 (16:58 +0000)]
Snap for
4603989 from
9d66948caaf607cca2d5631b80de813e241953a8 to oc-m2-release
Change-Id: I755384ee42c38de93a3422c117e55ca4ec6fdd38
Chih-Wei Huang [Wed, 7 Mar 2018 08:56:06 +0000 (16:56 +0800)]
Merge tag 'android-8.1.0_r18' into oreo-x86
Android 8.1.0 Release 18 (OPM5.171019.017)
Koushik Dutta [Thu, 28 Feb 2013 22:49:24 +0000 (14:49 -0800)]
Settings: Add Superuser entry
Amended for oreo-x86 porting by cwhuang.
Squashed commit of the following:
Author: Koushik Dutta <koushd@gmail.com>
Switch to new Superuser
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Author: Danny Baumann <dannybaumann@web.de>
Hide Superuser entry if root access for apps is disabled.
Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Development: Root for apps is unavailable if the su daemon isn't running
The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.
Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Steve Kondik [Sun, 15 Jan 2012 01:05:59 +0000 (17:05 -0800)]
Add preference for enabling root access (3/3)
* Root over ADB is now disabled by default on non-eng builds
* Requires support in su binary and adbd
* Root access can be configured to use ADB only, apps only, or all
Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java
Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.
Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff
DevSettings: Fix the root-access toggle in eng builds
It was being unconditionally removed, put it back
Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47
android-build-team Robot [Mon, 26 Feb 2018 18:03:05 +0000 (18:03 +0000)]
Snap for
4565141 from
6021cde9513345ff2bc20b518a3d8aadc2e4d15b to oc-m4-release
Change-Id: Ic497bd9ac6fe81c783deb161e009b9dd05d434cb
android-build-team Robot [Thu, 8 Feb 2018 04:16:36 +0000 (04:16 +0000)]
Merge cherrypicks of [
3581037,
3581038,
3580473,
3580624,
3580656,
3580657,
3580658,
3580382,
3580474,
3580475,
3581039,
3581040,
3580476,
3580206,
3581527,
3580955,
3580956,
3580957,
3580958,
3580959,
3580960,
3580961,
3580962,
3580963,
3580964,
3580965,
3580966,
3581567,
3581568,
3581569,
3581570,
3581571,
3580625,
3580626,
3581587,
3581513,
3581514,
3581515,
3580477,
3581588,
3580659,
3580660,
3580383,
3580384,
3580478,
3580719,
3580479,
3580480,
3581385,
3581528,
3581041,
3581042,
3581043,
3581044,
3581045,
3581046,
3581607,
3580385,
3580481,
3580482,
3580483,
3580661,
3580662,
3580663,
3580664,
3580665,
3580484,
3580485,
3581608,
3581609,
3581610,
3581611,
3581612,
3581589,
3581613,
3580486,
3581519,
3581627,
3581628,
3581529,
3581530,
3581531,
3581629,
3581630] into oc-mr1-release
Change-Id: I5eeff9fc814bc819c9dbbedb281f148b7e297eba
jackqdyulei [Wed, 25 Oct 2017 17:41:30 +0000 (10:41 -0700)]
DO NOT MERGE Add metric log for anomaly.
This cl creates metric log when anomaly surfaces in battery page or
anomaly dialog.
Each anomaly action contains two fields:
1. FIELD_CONTEXT(int): determine which fragment start this action.
2. FIELD_ANOMALY_ACTION_TYPE(int): determine action type for this
anomaly.
**Cherry-picked from ag/
3120176. Fix merge conflict in import part
in AdvancedPowerUsageDetail**
Bug:
68215016
Test: RunSettingsRoboTests
Change-Id: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
(cherry picked from commit
adf11594d3510cd947e186ce4dec254223f1da10)
jackqdyulei [Tue, 24 Oct 2017 01:21:33 +0000 (18:21 -0700)]
Add metric id for anomaly fragments.
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment
Bug:
37681923
Test: Build
Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit
725562c7484439172dece19c72b5c76943144638)
(cherry picked from commit
2fd1c9839c08144d51c498baf2bff3fff020c6ee)
android-build-team Robot [Fri, 19 Jan 2018 18:51:19 +0000 (18:51 +0000)]
Merge cherrypicks of [
3484108,
3483651] into oc-m2-release
Change-Id: Ied8deb31e77aadd4512fe896863f854566299434
jackqdyulei [Wed, 25 Oct 2017 17:41:30 +0000 (10:41 -0700)]
DO NOT MERGE Add metric log for anomaly.
This cl creates metric log when anomaly surfaces in battery page or
anomaly dialog.
Each anomaly action contains two fields:
1. FIELD_CONTEXT(int): determine which fragment start this action.
2. FIELD_ANOMALY_ACTION_TYPE(int): determine action type for this
anomaly.
**Cherry-picked from ag/
3120176. Fix merge conflict in import part
in AdvancedPowerUsageDetail**
Bug:
68215016
Test: RunSettingsRoboTests
Change-Id: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
(cherry picked from commit
adf11594d3510cd947e186ce4dec254223f1da10)
android-build-team Robot [Thu, 18 Jan 2018 22:44:15 +0000 (22:44 +0000)]
Merge cherrypicks of [
3478238,
3478653,
3478239,
3478580,
3478612,
3478240,
3478654,
3478655,
3478656,
3479494,
3479495,
3478933,
3478934,
3479496,
3479497,
3479498,
3478160,
3478161,
3478162,
3478876,
3478877,
3478878,
3478241,
3478163,
3478164,
3478165,
3478166,
3478167,
3478168,
3478169,
3479990,
3479991,
3479992,
3480010,
3480011,
3480012] into oc-m2-release
Change-Id: I7518bb5d1823226d72989c675f6915f1753b55a9
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug:
69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
(cherry picked from commit
9e19121a00b85d7618bf294f70afa0f205e3ac00)
android-build-team Robot [Thu, 18 Jan 2018 19:43:05 +0000 (19:43 +0000)]
Merge cherrypicks of [
3478016,
3477857,
3477909,
3478630,
3478631,
3478556,
3478557,
3477761,
3477762,
3477763,
3478043,
3478044,
3478045,
3478441,
3478442,
3478443,
3478018,
3478558,
3478559,
3478560,
3478561,
3478562,
3478563,
3478564,
3478565,
3478566,
3478567,
3478568,
3478569] into oc-m5-release
Change-Id: Ibde56eac68c3bf0ea5262b1db52d048d42ad71e7
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug:
69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
(cherry picked from commit
9e19121a00b85d7618bf294f70afa0f205e3ac00)
android-build-team Robot [Thu, 18 Jan 2018 19:09:12 +0000 (19:09 +0000)]
Merge cherrypicks of [
3478311,
3478390,
3478133,
3478175,
3478391,
3478392,
3478393,
3478134,
3478135,
3478213,
3478214,
3478215,
3478233,
3478234,
3478235,
3478251,
3478252,
3478253,
3478254,
3478394,
3478395,
3478396,
3478397,
3478398,
3478399,
3478400,
3478401,
3478402,
3478403,
3478292,
3478293,
3478312,
3478136,
3477911] into oc-mr1-release
Change-Id: I49326c9c58e834f363547b3047b2b5d1ebd0703e
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug:
69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
(cherry picked from commit
9e19121a00b85d7618bf294f70afa0f205e3ac00)
android-build-team Robot [Tue, 16 Jan 2018 21:39:07 +0000 (21:39 +0000)]
Merge cherrypicks of [
3463668,
3464926,
3464927,
3464663,
3464895,
3464928,
3464896,
3464664,
3464665,
3464666,
3464492,
3464456,
3464929,
3465492,
3465473] into oc-m2-release
Change-Id: Iba94fca4f61da645d68a4ac14b0f280a170d00d3
jackqdyulei [Tue, 24 Oct 2017 01:21:33 +0000 (18:21 -0700)]
Add metric id for anomaly fragments.
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment
Bug:
37681923
Test: Build
Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit
725562c7484439172dece19c72b5c76943144638)
(cherry picked from commit
2fd1c9839c08144d51c498baf2bff3fff020c6ee)
android-build-team Robot [Fri, 5 Jan 2018 18:56:49 +0000 (18:56 +0000)]
Snap for
4527419 from
0dc90d9d19e4e1d5b0e55f70b8c2b280424f19db to oc-m2-release
Change-Id: I9c0778ca986fc6b9fb9161c2caf667390ec61e05
android-build-team Robot [Thu, 4 Jan 2018 19:32:44 +0000 (19:32 +0000)]
Merge cherrypicks of [
3416661,
3417182,
3417738,
3417739,
3417758,
3417360,
3417361,
3417362,
3417363,
3416401,
3416402,
3416403,
3417778,
3417798,
3416662,
3416663,
3417799,
3417800,
3417364] into oc-m5-release
Change-Id: I948f23f8151d2813cd1c1a071242cec6e2004b62
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug:
62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
(cherry picked from commit
e14d38a3833676a9ee36155371136b83c4bfadb7)
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
(cherry picked from commit
f20e0a492b3f414d667693fa121f2b76fe47f150)
Chih-Wei Huang [Tue, 12 Dec 2017 17:23:34 +0000 (01:23 +0800)]
Add information about OpenGL driver version
In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.
Chih-Wei Huang [Fri, 8 Dec 2017 09:08:43 +0000 (17:08 +0800)]
Add Manufacturer to device info
Add an item to display manufacturer in device info page.
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
android-build-team Robot [Thu, 14 Dec 2017 21:21:44 +0000 (21:21 +0000)]
Merge cherrypicks of [
3365569,
3365570,
3366860,
3366878,
3365571,
3365572,
3366918,
3365573,
3365589,
3365590,
3366938,
3366902,
3365574,
3365575,
3365576,
3365577,
3366958,
3365824,
3365591,
3366959,
3366960,
3366961,
3366962,
3366963,
3366964,
3366965,
3366919,
3366966,
3366967,
3366968,
3366969,
3366970,
3367018,
3367019,
3365592,
3365593,
3366985,
3365825,
3366988,
3366989,
3366990,
3366991,
3366992,
3366993,
3366994,
3367004,
3367005,
3367006,
3367007,
3367008,
3367009,
3367010,
3367011,
3367012,
3367013,
3367014,
3367015,
3367016,
3367017,
3367038,
3367039,
3367040,
3367041,
3367042,
3367044,
3367045,
3367046,
3367049,
3367050,
3367052,
3367053,
3367054,
3367055,
3367056,
3366920,
3366921,
3366922,
3367079] into oc-mr1-release
Change-Id: Ia28588d70733a5ae7de4576c2a6cd81ab328ef34
Fan Zhang [Wed, 29 Nov 2017 18:53:37 +0000 (10:53 -0800)]
Update asset for no search result image
Bug:
68863351
Test: visual
Change-Id: Ia4d411e5d7d1db8b321fdfde006a93c6ff52ecb3
(cherry picked from commit
cb721bd870f73af7e156076f5fe57314436a5312)
(cherry picked from commit
8fe9c25e35e50d9c26c78ee78c0210c4c12705a2)
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug:
62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
(cherry picked from commit
e14d38a3833676a9ee36155371136b83c4bfadb7)
Chien-Yu Chen [Fri, 10 Nov 2017 21:51:24 +0000 (13:51 -0800)]
Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug:
68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
(cherry picked from commit
7bae205499b1583c7cbbdb4dac4a4e9a6ca45755)
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit
781e762c2c68027c6b4bf8bcb71979c5e8c595c3.
Test: CTS
Bug:
67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24
(cherry picked from commit
24721e7d9684935640bdca6509c7d7522c173582)
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
(cherry picked from commit
f20e0a492b3f414d667693fa121f2b76fe47f150)
android-build-team Robot [Tue, 5 Dec 2017 01:14:37 +0000 (01:14 +0000)]
Merge cherrypicks of [
3310659,
3311062,
3310913,
3310647,
3310648,
3310649,
3310650,
3310651,
3311172,
3310601,
3311109,
3311193,
3311213,
3311214,
3311215,
3311216,
3311217,
3311218,
3311219,
3311220,
3311221,
3311222,
3311223,
3311063,
3311225,
3311252,
3311253,
3311254,
3311255,
3311256,
3311258,
3311259,
3311261,
3311262,
3311263,
3311264,
3311265,
3311267,
3311268,
3311269,
3311270,
3311271,
3311312,
3311313,
3311315,
3311317,
3311320,
3311322] into oc-m4-release
Change-Id: I367328f711b7c70352b6e4ddc2a6494fa20b3126
Chien-Yu Chen [Fri, 10 Nov 2017 21:51:24 +0000 (13:51 -0800)]
Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug:
68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
(cherry picked from commit
7bae205499b1583c7cbbdb4dac4a4e9a6ca45755)
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit
781e762c2c68027c6b4bf8bcb71979c5e8c595c3.
Test: CTS
Bug:
67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24
(cherry picked from commit
24721e7d9684935640bdca6509c7d7522c173582)
android-build-team Robot [Tue, 28 Nov 2017 23:35:24 +0000 (23:35 +0000)]
Snap for
4448085 from
7ca92b7b5bd24c61ca788b9929e9b73fbc19d5f4 to oc-m3-release
Change-Id: I9acf36c37d0c92ba471f7c6321ece6b9de01880f
android-build-team Robot [Mon, 13 Nov 2017 19:53:39 +0000 (19:53 +0000)]
Snap for
4448085 from
7ca92b7b5bd24c61ca788b9929e9b73fbc19d5f4 to oc-m4-release
Change-Id: If292afed3b333bb78a6da3d02c103889a0b62843
android-build-team Robot [Thu, 9 Nov 2017 21:40:30 +0000 (21:40 +0000)]
Snap for
4442250 from
7ca92b7b5bd24c61ca788b9929e9b73fbc19d5f4 to oc-m2-release
Change-Id: I20cde251136f61d198a9f0d7d1962f5b7f1e4033
android-build-team Robot [Thu, 9 Nov 2017 05:44:09 +0000 (05:44 +0000)]
Merge cherrypicks of [
3196053,
3195996,
3195997,
3195998,
3196073,
3196093,
3196113,
3195934,
3195999,
3196074,
3196133,
3196134,
3195914,
3195915,
3195916] into oc-mr1-release
Change-Id: I61388ab9620f684377d5eb06df4ccf591553f9b6
Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]
Enforce null check for mAccessPoint
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug:
68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit
0117b995f44758a64b7af6d2d11e17d10ef125ce)
(cherry picked from commit
6c12f06bf896ce0ab6e91af27ac14263533e43fc)
android-build-team Robot [Fri, 3 Nov 2017 22:45:18 +0000 (22:45 +0000)]
Snap for
4431872 from
bfc1cee888850b9f55cf42ffacb17a217381da9c to oc-m2-release
Change-Id: I943522fff7d87fa6a8a2e659369228fed3b15b13
android-build-team Robot [Thu, 2 Nov 2017 04:51:28 +0000 (04:51 +0000)]
Merge cherrypicks of [
3156476,
3155698,
3156194,
3156639,
3156018,
3156477,
3156098,
3156099,
3156100,
3156101,
3156102,
3158393,
3155699,
3155700,
3156195,
3156196,
3156019,
3156020,
3158394] into oc-mr1-release
Change-Id: I21ded79f3ace42dc5daff630682023cbb0792a18
Courtney Goeltzenleuchter [Mon, 9 Oct 2017 23:13:47 +0000 (17:13 -0600)]
Check system support of wide-color
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.
Bug:
64801219
Bug:
67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.
Change-Id: If28e52da174dd460850bc84744818979f52add78
(cherry picked from commit
bae1b24ba306793ca2d86aa80552bd79e0e54742)
(cherry picked from commit
66e4dac39360cc190011455060edbbaf42bef74b)
android-build-team Robot [Thu, 26 Oct 2017 20:06:45 +0000 (20:06 +0000)]
Snap for
4417144 from
4f6263a527f2ec54049bb71aa370d1d128f7b166 to oc-m2-release
Change-Id: I9236ad54a0295a4cdc6faf5f44cdf13dabc5e893
android-build-team Robot [Wed, 25 Oct 2017 21:03:42 +0000 (21:03 +0000)]
Merge cherrypicks of [
3120219,
3121602,
3124243,
3125180] into oc-mr1-release
Change-Id: Idb4be19cae4a309ea39e4ad3f49146b7c806184a
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
DO NOT MERGE - Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
(cherry picked from commit
cd2b7aea5f010727d01cdd0bd1db7b4df5514360)
android-build-team Robot [Wed, 25 Oct 2017 05:31:54 +0000 (05:31 +0000)]
Merge cherrypicks of [
3122088,
3121430,
3119129,
3119130,
3119131,
3120667] into oc-mr1-release
Change-Id: I4e98e0a22dc691d28d34d50205ffb38d68a6934c
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit
05fa18f8474cd5fed798e7ee7ef099682c4a4475)
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
(cherry picked from commit
66ecad49ba283aef5389876f1be6ffd52fb74030)
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit
e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)
android-build-team Robot [Tue, 24 Oct 2017 06:12:34 +0000 (06:12 +0000)]
Merge cherrypicks of [
3116469,
3116470,
3116074,
3116075,
3116498,
3116499,
3117095,
3115988,
3116845,
3116471,
3116500,
3116573,
3115989,
3116501,
3116076,
3116472] into oc-mr1-release
Change-Id: I174cd31296e511ffd4498e7e6184821cee8099b8
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug:
68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
(cherry picked from commit
dd8e66fa202f9b351c7be174c81df63adb1767e2)
android-build-team Robot [Thu, 19 Oct 2017 06:09:20 +0000 (06:09 +0000)]
Snap for
4404534 from
6b56423651aa2a7b9b23d24f4a5e5af22cd1a6e8 to oc-mr1-release
Change-Id: Idec735861dd609c32030f09f830d9f5aed344844
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428