Commit Graph

30268 Commits

Author SHA1 Message Date
Bill Yi
e6c8409112 Import translations. DO NOT MERGE
am: a48002a65a  -s ours

Change-Id: I21d68ceafcfb4fa08a5e9ad6f8d6c66e4a238787
2016-12-15 08:05:57 +00:00
Bill Yi
a48002a65a Import translations. DO NOT MERGE
Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import
2016-12-14 21:03:28 -08:00
Zhendong Yang
8c9e3db8d9 Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d
am: 8711f4055d

Change-Id: Idb2d601fa627dcb8268228435192392c760787d0
2016-12-14 05:53:04 +00:00
Zhendong Yang
8711f4055d Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
am: 7598c6201d

Change-Id: I97e9ef07df912e7bac3c4657272feab943bcb84e
2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d Merge "Fix crash when rotating HighPowerDetail dialog"
am: 783ff43769

Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859
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
4cce4c5170 Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
am: 0e7405fc17

Change-Id: Ie336a58e84b889d8700ab64b56248f0c4933c5fa
2016-12-14 02:19:24 +00:00
Tony Mak
2d45ef14e5 DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
am: 8a2f28a629

Change-Id: I1c8cdfe6e4c052a0bee1391c9c1166868da5f6ac
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
Bill Yi
a379685253 Import translations. DO NOT MERGE
am: a4e78d242d  -s ours

Change-Id: Ie0ee095783da15c15ba64fd736a175bb1600287a
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

Change-Id: Ib7b4cb112fcde7e8286f24e59aa31befef56a068
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  -s ours

Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9
2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669 Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921
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
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
Youhan Wang
9706936945 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
am: f6b8321654

Change-Id: Icc7bbc20943c224bfb6cc0131480cf394b1e1124
2016-12-09 22:24:30 +00:00
Nathan Harold
70ab95ee63 Add Ims Registration Info to RadioInfo
am: 839b9f9733

Change-Id: I18a64c82bf853b86da4fe99981b1b8d6f5955643
2016-12-09 22:23:33 +00:00
Nathan Harold
cc140412a5 Enable and Disable IMS Provisioning Based on Platform Capability
am: c137050588

Change-Id: If618e69ebc504e55ab5a8eda874104f471ae44fc
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

Change-Id: If27c734d231abbc76d21ac6efcab3933fe34f460
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

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba
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

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c
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

Change-Id: If2822dfcebf95546c0fa2ee96d3e689e104f3d59
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  -s ours

Change-Id: I3d20b9cf6c05d4f4770790336ecffcc53eebe11e
2016-12-01 19:13:45 +00:00
Bill Yi
f131815859 Import translations. DO NOT MERGE
am: 5a05a8a4ea  -s ours

Change-Id: Ia227c18a81391b0609518b9a68001598bd389191
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

Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d
2016-12-01 02:27:02 +00:00
Amin Shaikh
7c8af0aedc Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace Merge "Refactor NetworkScoreAppManager for testing."
am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
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

Change-Id: I0a5dd13992a450a04417bdc703781fb2d4c79055
2016-12-01 00:13:50 +00:00
Stephen Chen
701e558586 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
am: 539eaa34d5

Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
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

Change-Id: I2c195509e31812f55b00a1ecc6bc1cdead3f90f4
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  -s ours

Change-Id: Ic72803a51ba93c56254173c8f428fb9a146bdc1a
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  -s ours

Change-Id: I1d86bc055b65520c41615ddf919c64890f1b653f
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

Change-Id: I490619e028e67635fbd97b9537e3f8435471c0b0
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  -s ours

Change-Id: I306a02fc5ca3330732fde9e8439b12e8a5f55389
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  -s ours

Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23
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

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
2016-11-23 23:29:22 +00:00