Youhan Wang
70b47859fa
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
...
am: d9b3709fc1
2016-12-21 00:37:24 +00:00
Youhan Wang
d9b3709fc1
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
2016-12-20 12:37:12 -08:00
Jeremy Joslin
1fed0c6ae7
Merge "New pref toggle for network recommendations." am: a5249906ab am: 2b03ffb264
...
am: 6061ca1b1a
2016-12-19 22:09:52 +00:00
Jeremy Joslin
6061ca1b1a
Merge "New pref toggle for network recommendations." am: a5249906ab
...
am: 2b03ffb264
2016-12-19 22:06:22 +00:00
Jeremy Joslin
2b03ffb264
Merge "New pref toggle for network recommendations."
...
am: a5249906ab
2016-12-19 22:02:23 +00:00
Jeremy Joslin
fbcff7a6b2
New pref toggle for network recommendations.
...
Adding a new toggle to control whether network
recommendations are enabled.
Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.
Test: Built and ran.
BUG: 33549591
BUG: 33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
2016-12-18 10:33:28 -08:00
Zhendong Yang
8c9e3db8d9
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d
...
am: 8711f4055d
2016-12-14 05:53:04 +00:00
Zhendong Yang
8711f4055d
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
...
am: 7598c6201d
2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d
Merge "Fix crash when rotating HighPowerDetail dialog"
...
am: 783ff43769
2016-12-14 05:38:34 +00:00
Treehugger Robot
783ff43769
Merge "Fix crash when rotating HighPowerDetail dialog"
2016-12-14 05:30:16 +00:00
Tony Mak
2d45ef14e5
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
...
am: 8a2f28a629
2016-12-14 02:19:22 +00:00
TreeHugger Robot
0e7405fc17
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
2016-12-14 02:08:37 +00:00
Svetoslav Ganov
c6a074c80d
DO NOT MERGE Add Bluetooth toggle prompts - settings
...
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
2016-12-12 09:44:39 -08:00
Zhendong Yang
cb911e3402
Fix crash when rotating HighPowerDetail dialog
...
When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().
Bug: 28333723
Test: manual - go to Settings > Apps > Clock,
click Battery optimization and rotate device
Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae
2016-12-12 20:55:40 +09:00
Tony Mak
8a2f28a629
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
2016-12-12 02:35:42 +00:00
Nathan Harold
70ab95ee63
Add Ims Registration Info to RadioInfo
...
am: 839b9f9733
2016-12-09 22:23:33 +00:00
Nathan Harold
cc140412a5
Enable and Disable IMS Provisioning Based on Platform Capability
...
am: c137050588
2016-12-09 22:23:26 +00:00
Youhan Wang
f6b8321654
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
2016-12-09 22:17:09 +00:00
xiaocheng.x.wang
b4624dceda
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
...
am: 2366d4dcfd
2016-12-09 21:08:45 +00:00
xiaocheng.x.wang
2366d4dcfd
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
...
am: 2d38abb49a
2016-12-09 21:02:45 +00:00
Treehugger Robot
5c6e7a2116
Merge "Fix apn can't be updated when pressing back key"
2016-12-09 20:50:39 +00:00
Daniel Nishi
edf31e2e38
Move private volume storage calculations into a shared lib.
...
am: c04f8b9ecd
2016-12-08 00:50:11 +00:00
Nathan Harold
839b9f9733
Add Ims Registration Info to RadioInfo
...
Replaced not used pdp list.
Bug:32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
2016-12-06 14:54:56 -08:00
Nathan Harold
c137050588
Enable and Disable IMS Provisioning Based on Platform Capability
...
Bug:32874442
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
2016-12-06 14:25:51 -08:00
Amin Shaikh
409f09b15a
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e am: 3140bb5ace
...
am: 7c8af0aedc
2016-12-01 02:27:02 +00:00
Amin Shaikh
7c8af0aedc
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
...
am: 3140bb5ace
2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace
Merge "Refactor NetworkScoreAppManager for testing."
...
am: 512368a22e
2016-12-01 02:11:06 +00:00
Amin Shaikh
f91ac62756
Refactor NetworkScoreAppManager for testing.
...
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
2016-11-29 10:17:34 -08:00
Daniel Nishi
c04f8b9ecd
Move private volume storage calculations into a shared lib.
...
Bug: 30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
2016-11-28 11:00:48 -08:00
Fan Zhang
b69ec294c2
Fix crash when opening account sync detail for external app am: c9cdc25f41
...
am: f3e86ca481
2016-11-23 23:29:22 +00:00
Steven Ng
26a3c28735
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
...
am: 046a63450f
2016-11-23 23:28:38 +00:00
Jerry Zhang
f8ed07fc64
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f am: a75fa91247
...
am: fd764ac0e3
2016-11-17 00:39:22 +00:00
Jerry Zhang
fd764ac0e3
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
...
am: a75fa91247
2016-11-17 00:24:50 +00:00
Jerry Zhang
a75fa91247
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
am: a1b60e629f
2016-11-17 00:09:38 +00:00
Jerry Zhang
89a055aa9d
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
2016-11-16 23:59:33 +00:00
Sohani Rao
7fd676ee26
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c
...
am: 6cebca2599
2016-11-14 21:28:16 +00:00
Sohani Rao
6cebca2599
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
...
am: 6f126a8f5c
2016-11-14 21:21:49 +00:00
Sohani Rao
6f126a8f5c
Merge "Add WiFi toggle prompts - settings"
...
am: b4b2c2aa43
2016-11-14 21:14:54 +00:00
Svetoslav Ganov
e06767af78
Add WiFi toggle prompts - settings
...
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug: 28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
2016-11-14 10:32:39 -08:00
xiaocheng.x.wang
7602e88504
Fix apn can't be updated when pressing back key
...
APN can't be updated because onkey() method is not invoked when user presses
the virtual back key. The ApnEditor was changed from Activity to Fragment
in Android N. A fragment can't receive onKey() event without calling
setFocusableInTouchMode(true).
Test: manual - updated apn setting, then pressed back
Bug: 32815214
Change-Id: I7824e84bd617d2057a61f4198fa7fd50f123bc8e
2016-11-11 12:48:57 +09:00
Stephen Chen
4ba959c7c4
Add subtypes to tron logging for Wifi toggles.
...
am: b21815e320
2016-11-04 17:22:30 +00:00
Stephen Chen
b21815e320
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
2016-11-03 14:16:06 -07:00
Juan Flores
8510f57509
Merge "Fix crash while searching in Settings" am: 176c0c5d98 am: d705a333ca
...
am: 16455893d7
2016-11-02 16:47:33 +00:00
Juan Flores
16455893d7
Merge "Fix crash while searching in Settings" am: 176c0c5d98
...
am: d705a333ca
2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca
Merge "Fix crash while searching in Settings"
...
am: 176c0c5d98
2016-11-02 16:42:03 +00:00
Treehugger Robot
176c0c5d98
Merge "Fix crash while searching in Settings"
2016-11-02 16:37:08 +00:00
Fan Zhang
1398c4b367
Fix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
...
am: ce01f167e1
2016-11-01 17:25:38 +00:00
Fan Zhang
f3e86ca481
Fix crash when opening account sync detail for external app
...
am: c9cdc25f41
2016-11-01 17:21:36 +00:00
Fan Zhang
c9cdc25f41
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 e3ad2b56c3
2016-10-31 21:57:36 +00:00
Paul Stewart
09797c330c
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968
...
am: dab924f04d
2016-10-28 21:14:38 +00:00
