Tony Mak
2d45ef14e5
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
...
am: 8a2f28a629
2016-12-14 02:19:22 +00:00
Bill Yi
a379685253
Import translations. DO NOT MERGE
...
am: a4e78d242d
2016-12-13 03:55:17 +00:00
Bill Yi
a4e78d242d
Import translations. DO NOT MERGE
...
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
2016-12-12 17:30:02 -08:00
Marie Janssen
1c4f12c6db
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours
...
am: f1342adb86
2016-12-12 21:46:12 +00:00
Marie Janssen
f1342adb86
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours
...
am: 0d60028669
2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
...
am: 8c11340b0c
2016-12-12 21:34:45 +00:00
Marie Janssen
8c11340b0c
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
2016-12-12 21:27:23 +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
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
Youhan Wang
9706936945
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
...
am: f6b8321654
2016-12-09 22:24:30 +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
xiaocheng.x.wang
2d38abb49a
Merge "Fix apn can't be updated when pressing back key"
...
am: 5c6e7a2116
2016-12-09 20:57:46 +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
Bill Yi
6114c8d76d
Import translations. DO NOT MERGE am: 5a05a8a4ea -s ours
...
am: f131815859
2016-12-01 19:13:45 +00:00
Bill Yi
f131815859
Import translations. DO NOT MERGE
...
am: 5a05a8a4ea
2016-12-01 19:07:44 +00:00
Bill Yi
5a05a8a4ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
2016-12-01 10:11:25 -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
Treehugger Robot
512368a22e
Merge "Refactor NetworkScoreAppManager for testing."
2016-12-01 01:59:14 +00:00
Stephen Chen
075e8da2a0
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 am: 539eaa34d5
...
am: 701e558586
2016-12-01 00:13:50 +00:00
Stephen Chen
701e558586
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
...
am: 539eaa34d5
2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
...
am: 666c9d7ea5
2016-11-30 23:59:43 +00:00
Treehugger Robot
666c9d7ea5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
2016-11-30 20:25:13 +00:00
Amin Shaikh
f91ac62756
Refactor NetworkScoreAppManager for testing.
...
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
2016-11-29 10:17:34 -08:00
Stephen Chen
e365aa8cd9
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
...
Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
2016-11-28 16:29:31 -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
660dad552b
Fix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
...
am: b69ec294c2
2016-11-23 23:45:30 +00:00
Bill Yi
7963df8127
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours am: 4666b50754 -s ours
...
am: 5cca5a64e8
2016-11-23 23:45:18 +00:00
Bill Yi
9a1589ad6a
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours
...
am: 57b56329f3
2016-11-23 23:45:05 +00:00
Steven Ng
e8928024c4
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 am: 046a63450f
...
am: 26a3c28735
2016-11-23 23:44:53 +00:00
Bill Yi
1ff86be2bd
Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours am: f8032d0b15 -s ours
...
am: 71a0bb85a5
2016-11-23 23:44:38 +00:00
Bill Yi
72976be89a
Import translations. DO NOT MERGE am: 475763d01c -s ours am: 9a22968ff8 -s ours
...
am: 88b043714b
2016-11-23 23:44:25 +00: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
Bill Yi
5cca5a64e8
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours
...
am: 4666b50754
2016-11-23 23:29:07 +00:00
Bill Yi
57b56329f3
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours
...
am: f8b4927683
2016-11-23 23:28:53 +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
Bill Yi
71a0bb85a5
Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours
...
am: f8032d0b15
2016-11-23 23:28:25 +00:00
Bill Yi
88b043714b
Import translations. DO NOT MERGE am: 475763d01c -s ours
...
am: 9a22968ff8
2016-11-23 23:28:12 +00:00
Bill Yi
d6de02579f
Import translations. DO NOT MERGE am: 001632d55c -s ours
...
am: 9e17133192
2016-11-21 01:33:23 +00:00
Bill Yi
9e17133192
Import translations. DO NOT MERGE
...
am: 001632d55c
2016-11-21 01:28:26 +00:00
Bill Yi
001632d55c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
2016-11-20 16:12:14 -08:00
Jerry Zhang
0a098f377c
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d am: 1451a4af78
...
am: 3473bc219e
2016-11-17 00:39:37 +00:00
