OSDN Git Service
Chih-Wei Huang [Wed, 16 Oct 2019 14:07:55 +0000 (22:07 +0800)]
Merge tag 'android-7.1.2_r39' into nougat-x86
Android 7.1.2 Release 39 (
5787804)
Jonathan Scott [Tue, 7 May 2019 16:20:00 +0000 (17:20 +0100)]
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug:
127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit
b985aa2f2930e30218bdd1cf1161453b7e622418)
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings
Fixes:
119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit
fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
(cherry picked from commit
04208f16b02c793f52b8c04d41799f79f286b056)
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)
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE 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
- set display search menu to false
- disallow update to display the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit
94ea2dad5b936381d8ea0195ea7e63df956c0aed)
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug:
62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
(cherry picked from commit
732b65ca4de0bf9cedeb3f2369a2ca596e78cfd3)
Hansong Zhang [Mon, 2 Apr 2018 17:48:18 +0000 (10:48 -0700)]
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name
Bug:
72872376
Bug:
73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
(cherry picked from commit
4f58c19afa6531fbc56222775dc776f8b976881c)
Chih-Wei Huang [Thu, 4 Jan 2018 08:40:20 +0000 (16:40 +0800)]
Merge tag 'android-7.1.2_r36' into nougat-x86
Android 7.1.2 Release 36 (N2G48H)
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)
Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes:
64339515
Bug:
38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
(cherry picked from commit
1cc50ae19093f2f0c219dd75d6841519e2acfeb4)
android-build-team Robot [Fri, 3 Nov 2017 19:55:39 +0000 (19:55 +0000)]
Merge cherrypicks of [
3166006,
3165952,
3164925,
3164926,
3164927,
3164928,
3167313,
3167314,
3167315,
3167316,
3167317,
3167318,
3167319,
3167320,
3167321,
3167322,
3166318,
3166319,
3166320,
3166321,
3166322,
3166323,
3166324,
3167333,
3167334,
3167373,
3165112,
3166325,
3165229,
3165230] into nyc-mr2-release
Change-Id: Ia32fd60f20866b4fc00eac4951fba5add39e0cd8
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
(cherry picked from commit
8441943bfa1dd72fad25ae9d20851b871dd9c143)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
(cherry picked from commit
8441943bfa1dd72fad25ae9d20851b871dd9c143)
android-build-team Robot [Thu, 28 Sep 2017 17:16:57 +0000 (17:16 +0000)]
Merge cherrypicks of [
2973982,
2974657,
2974658,
2973983,
2973984,
2974689,
2974690,
2974691,
2974692,
2974710,
2974711,
2974713,
2974714,
2974215,
2974216,
2974217,
2974218,
2974219,
2974220,
2974729,
2974730,
2974731,
2974732,
2974733,
2974734,
2974735,
2974736,
2974737,
2974738,
2974739,
2974740,
2974741,
2974742,
2974749,
2974750,
2974751,
2974752,
2974753,
2974647,
2974744,
2974693,
2974694,
2974648,
2974513,
2974665,
2974746] into nyc-mr2-release
Change-Id: I0d33346d338c50065825f52a47a1c09c4a27a4c6
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
(cherry picked from commit
8e08a9bb715ff6a6b6bfa9556c3666a10f87053a)
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
(cherry picked from commit
8e08a9bb715ff6a6b6bfa9556c3666a10f87053a)
android-build-team Robot [Thu, 27 Jul 2017 00:30:15 +0000 (00:30 +0000)]
Merge cherrypicks of [
2607234,
2607235,
2606313,
2607236,
2607238,
2607239,
2606314,
2606315,
2607240,
2606316,
2606317,
2607241,
2607242,
2607243,
2607244,
2607370,
2607371,
2607245,
2607246,
2607247,
2607248,
2607249,
2607372,
2607390,
2607391,
2607392,
2607393,
2607373,
2607394,
2607397,
2607398,
2607375,
2607401,
2607376,
2607402,
2607377,
2607403,
2607404,
2607378,
2607405,
2607379,
2607380,
2607381,
2607406,
2607382,
2607407,
2607408,
2607409] into nyc-mr2-release
Change-Id: Icc26e4fc1c963ded7996ec0ce416643c1ff3d759
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
(cherry picked from commit
e76e053595660ed2a75adb33ee124a7bfbed164b)
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
(cherry picked from commit
e76e053595660ed2a75adb33ee124a7bfbed164b)
Chih-Wei Huang [Tue, 18 Jul 2017 05:53:52 +0000 (13:53 +0800)]
Merge tag 'android-7.1.2_r27' into nougat-x86
Android 7.1.2 release 27
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
(cherry picked from commit
14153fd25b4757add2107d35e71fcfbb55c1e419)
(cherry picked from commit
21e0e3ddce7a5c3ed649251f390e05ac91d47c41)
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
(cherry picked from commit
14153fd25b4757add2107d35e71fcfbb55c1e419)
(cherry picked from commit
581bd1c20d136f37a7803bdf4107baa2e793d85e)
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
(cherry picked from commit
14153fd25b4757add2107d35e71fcfbb55c1e419)
Dmitry Dementyev [Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)]
resolve merge conflicts of
3964c51bf2 to nyc-dev
Bug:
33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit
0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
Dmitry Dementyev [Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)]
resolve merge conflicts of
3964c51bf2 to nyc-dev
Bug:
33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit
0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
Chih-Wei Huang [Fri, 23 Sep 2016 09:04:30 +0000 (17:04 +0800)]
Add an option to control native bridge
Paulo Sergio Travaglia [Sun, 27 Sep 2015 01:35:48 +0000 (01:35 +0000)]
Create an EGL context for DeviceInfoSettings
In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.
Lukasz Anaczkowski [Mon, 13 May 2013 15:11:12 +0000 (17:11 +0200)]
Add information about OpenGL driver version
Change-Id: Icf107642b6d84a85c90c7411d6e42e9b6c6ef739
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Daniel Leung [Wed, 2 May 2012 23:37:00 +0000 (16:37 -0700)]
Added Manufacturer to device info
Added an item to display manufacturer in device info page.
For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Koushik Dutta [Thu, 28 Feb 2013 22:49:24 +0000 (14:49 -0800)]
Settings: Add Superuser entry
Amended for nougat-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
Dmitry Dementyev [Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)]
resolve merge conflicts of
3964c51bf2 to nyc-dev
Bug:
33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit
0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev
Philip P. Moltmann [Mon, 13 Feb 2017 20:58:46 +0000 (20:58 +0000)]
[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."
This reverts commit
81758edffae751c31fb1795febe470c171f7fb1b.
Bug:
30662828
Change-Id: I5c877a3a888f075afcfb9f49ec92cf3ad43f6304
Bill Yi [Mon, 13 Feb 2017 07:02:41 +0000 (23:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85aa9d355617a44a438932f30332cfcbb70842a
Auto-generated-cl: translation import
Fan Zhang [Sat, 11 Feb 2017 18:50:13 +0000 (10:50 -0800)]
DO NOT MERGE Fix "3 dot" icon size so it displays fully
Viewport size was set wrong due to bad merge, causing the last dot got
truncated slightly.
Change-Id: I5d5bbd703e780b21957613d88a2250bc3ba69bb8
Fix:
28194068
Test: visual
Bill Yi [Thu, 9 Feb 2017 02:55:40 +0000 (18:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48c8f3d9a4b34c83e0bc5737446c002584ef86a7
Auto-generated-cl: translation import
Junda Liu [Tue, 7 Feb 2017 20:35:46 +0000 (20:35 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:20:22 +0000 (04:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 01:12:48 +0000 (17:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad621de4653a4ebbf3e3161a58ec8edb40e26022
Auto-generated-cl: translation import
Fan Zhang [Mon, 6 Feb 2017 20:39:00 +0000 (12:39 -0800)]
Update "more" icon so the 3 dots are perfectly round.
Bug:
28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
Junda Liu [Sat, 4 Feb 2017 00:39:23 +0000 (16:39 -0800)]
Ignore orientation change to preserve ApnEditor.
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/
34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
Bill Yi [Fri, 3 Feb 2017 07:43:15 +0000 (23:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 1 Feb 2017 23:08:53 +0000 (23:08 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
Christine Franks [Fri, 20 Jan 2017 19:24:14 +0000 (11:24 -0800)]
DO NOT MERGE - Require password to FR in carrier demo mode
Bug:
34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
Christine Franks [Tue, 24 Jan 2017 00:44:02 +0000 (16:44 -0800)]
DO NOT MERGE - Allow FR in carrier demo mode
Bug:
34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
Bill Yi [Tue, 31 Jan 2017 07:10:41 +0000 (23:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
Philip P. Moltmann [Mon, 12 Dec 2016 23:29:55 +0000 (15:29 -0800)]
[DO NOT MERGE] Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests
Bug:
33385963
Bug:
30662828
Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit
231c9fbfa68d54ce44fad36df0701d4fd566a5aa)
TreeHugger Robot [Fri, 27 Jan 2017 20:31:39 +0000 (20:31 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
TreeHugger Robot [Fri, 27 Jan 2017 19:59:03 +0000 (19:59 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
Salvador Martinez [Wed, 25 Jan 2017 22:56:03 +0000 (14:56 -0800)]
Remove fake data
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.
Test: Robotests still pass
Bug:
34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Salvador Martinez [Tue, 24 Jan 2017 23:16:52 +0000 (15:16 -0800)]
Fix null pointer exception when surveys are turned off
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.
Test: RunSettingsRoboTests (master)
Bug:
33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
TreeHugger Robot [Fri, 27 Jan 2017 03:37:44 +0000 (03:37 +0000)]
Merge "Finalize string for usage alerts." into nyc-mr2-dev
Andrew Sapperstein [Fri, 27 Jan 2017 01:30:30 +0000 (17:30 -0800)]
Finalize string for usage alerts.
Test: manual
Bug:
34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
Stefano Tommasini [Thu, 26 Jan 2017 10:31:14 +0000 (10:31 +0000)]
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
TreeHugger Robot [Thu, 26 Jan 2017 07:06:17 +0000 (07:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 26 Jan 2017 04:04:52 +0000 (20:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
Jerry Zhang [Wed, 25 Jan 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
Stefanot [Wed, 25 Jan 2017 11:20:50 +0000 (11:20 +0000)]
*DO NOT MERGE* Create new suggestion category for backup.
Test: manual
BUG:
34219298
Change-Id: I288d36b2b48582e5f8e0d1720d1f7004ad8dae2c
Jerry Zhang [Wed, 12 Oct 2016 21:42:56 +0000 (14:42 -0700)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.
Bug:
31814300
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit
5d36a177d95184aaa0763d07aa38ff028f5a9b9c)
Stefano Tommasini [Sat, 21 Jan 2017 19:44:15 +0000 (19:44 +0000)]
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
Stefanot [Fri, 13 Jan 2017 14:58:41 +0000 (14:58 +0000)]
Add SuggestionFeatureProvider interface.
The interface is added so that a vendor can add new suggestions to the
settings app, and customize details for these suggestions.
Test: make RunSettingsRoboTests
BUG:
34219298
Change-Id: I373c63709b1aaf68360aa2561a2ecfc3194e0e2b
Bill Yi [Fri, 20 Jan 2017 20:31:51 +0000 (12:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
Jack He [Tue, 1 Nov 2016 22:38:38 +0000 (15:38 -0700)]
Fix Bluetooth pairing dialogue crash
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.
This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.
Bug:
32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit
6f8e9eda2d9ed830d47971d93327792906db2dc1)
Bill Yi [Thu, 19 Jan 2017 03:10:06 +0000 (19:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I610fb1c188fb93d6e2d70dd52da7dd766d27c209
Auto-generated-cl: translation import
Jaewoong Jung [Tue, 20 Dec 2016 02:39:41 +0000 (18:39 -0800)]
Implements additional battery info menu behavior.
This is a manual cherry-pick of commit
6a43a06cac12494cd27e5b5cad4149a272d90038.
Bug:
33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
Jaewoong Jung [Fri, 13 Jan 2017 22:38:10 +0000 (22:38 +0000)]
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
Jaewoong Jung [Tue, 13 Dec 2016 01:32:31 +0000 (17:32 -0800)]
Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e549636e98b7fa0f12761be934f8f36b.
Bug:
33352540
Test: No additional test failures.
Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
Salvador Martinez [Fri, 16 Dec 2016 00:13:38 +0000 (16:13 -0800)]
Removed fake data
Was using fake data for testing that we could attach
payloads. This is no longer needed since we are now
attaching real data.
Test: Manual Verification on GCS
Bug:
27823357
Change-Id: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Bill Yi [Thu, 12 Jan 2017 14:02:43 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
Salvador Martinez [Thu, 8 Dec 2016 20:44:47 +0000 (12:44 -0800)]
Added survey triggering mechanisms
Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.
Test: RoboTests(master) && JUnitTests
Bug:
27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9
Salvador Martinez [Wed, 19 Oct 2016 19:51:45 +0000 (12:51 -0700)]
Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.
Test: In Master Branch
Bug:
27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
Geoffrey Pitsch [Tue, 10 Jan 2017 19:06:00 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
TreeHugger Robot [Tue, 10 Jan 2017 07:18:41 +0000 (07:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Mon, 9 Jan 2017 21:14:43 +0000 (13:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
pkanwar [Mon, 9 Jan 2017 20:21:22 +0000 (12:21 -0800)]
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.
Bug:
34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
Bill Yi [Thu, 5 Jan 2017 01:46:43 +0000 (17:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 08:59:18 +0000 (00:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id7a36307bc781734e2647f01af6b07b5ed3a600a
Auto-generated-cl: translation import
Geoffrey Pitsch [Wed, 28 Dec 2016 17:29:40 +0000 (12:29 -0500)]
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app. After unblocking, the
controls will be hidden the next time settings is visited.
Bug:
32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
Nathan Harold [Fri, 23 Dec 2016 01:11:39 +0000 (01:11 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
pkanwar [Sun, 11 Dec 2016 23:36:34 +0000 (15:36 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
Bill Yi [Thu, 22 Dec 2016 05:59:21 +0000 (21:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
Youhan Wang [Fri, 16 Dec 2016 23:53:16 +0000 (15:53 -0800)]
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
Failed Treehugger automerge to master, will be cherry-picked to master
manually.
Bug:
32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
Nathan Harold [Tue, 20 Dec 2016 02:04:52 +0000 (18:04 -0800)]
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.
Bug:
28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
(cherry picked from commit
f8555e481263e936ab853a32431c188d34419467)
Bill Yi [Thu, 15 Dec 2016 05:03:28 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 14 Dec 2016 02:08:36 +0000 (02:08 +0000)]
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
Bill Yi [Tue, 13 Dec 2016 01:30:02 +0000 (17:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
Tony Mak [Mon, 12 Dec 2016 02:29:55 +0000 (02:29 +0000)]
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
This is a cherry-pick of ag/
1640561.
1. Context.getActivityToken is not available in n mr2, passed the token
from the activity to the controller instead.
2. Haven't pick the tests from master to mr2 branch because robotest
is not set up in mr2 branch.
Fix:
32959373
Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc
Youhan Wang [Fri, 9 Dec 2016 22:17:08 +0000 (22:17 +0000)]
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
* changes:
Add Ims Registration Info to RadioInfo
Enable and Disable IMS Provisioning Based on Platform Capability
Nathan Harold [Thu, 27 Oct 2016 20:45:00 +0000 (13:45 -0700)]
Add Ims Registration Info to RadioInfo
Replaced not used pdp list.
Bug:
32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
Nathan Harold [Fri, 28 Oct 2016 18:45:59 +0000 (11:45 -0700)]
Enable and Disable IMS Provisioning Based on Platform Capability
Bug:
32874442
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
Daniel Nishi [Mon, 19 Sep 2016 19:16:21 +0000 (12:16 -0700)]
Move private volume storage calculations into a shared lib.
Bug:
30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
Bill Yi [Mon, 14 Nov 2016 17:50:59 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
Bill Yi [Sat, 5 Nov 2016 05:19:32 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
Stephen Chen [Mon, 31 Oct 2016 19:59:41 +0000 (12:59 -0700)]
Add subtypes to tron logging for Wifi toggles.
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.
Bug:
32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105
Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
Fan Zhang [Tue, 1 Nov 2016 17:23:38 +0000 (17:23 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41
am:
f3e86ca481
Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
Fan Zhang [Tue, 1 Nov 2016 17:21:36 +0000 (17:21 +0000)]
Fix crash when opening account sync detail for external app
am:
c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
Fix crash when opening account sync detail for external app
Bug:
32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit
e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)
Bill Yi [Thu, 27 Oct 2016 05:31:37 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours
am:
4666b50754 -s ours
Change-Id: I89ed1044560f40ebb78d0e1b9bf07a4a7cd575b7
OSDN Git Service
