OSDN Git Service
Zhijun He [Thu, 31 Aug 2017 04:25:28 +0000 (04:25 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
am:
13991ff9f3
Change-Id: I47e318a843dcec3192999c2ba168ba646541e3af
Zhijun He [Thu, 31 Aug 2017 04:20:59 +0000 (04:20 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
Fan Zhang [Thu, 31 Aug 2017 03:24:36 +0000 (03:24 +0000)]
Misc icon updates
am:
24dc1ab39e
Change-Id: I3db014aa9b51b12226d9f616de73f757cd6f9dd4
Maurice Lam [Thu, 31 Aug 2017 02:39:41 +0000 (02:39 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am:
108611ff34 am:
61c8796a5e
am:
46a04ecca1
Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0
Maurice Lam [Thu, 31 Aug 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am:
108611ff34
am:
61c8796a5e
Change-Id: Ib9c5f652ebafe278ac444a0b3bf9d32aa6b37ac3
Maurice Lam [Thu, 31 Aug 2017 02:10:37 +0000 (02:10 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am:
108611ff34
Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
Fan Zhang [Wed, 30 Aug 2017 22:18:27 +0000 (15:18 -0700)]
Misc icon updates
Fixes:
65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
Lei Yu [Wed, 30 Aug 2017 17:15:02 +0000 (17:15 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev
am:
f5d7db2cfa
Change-Id: I7ffb1cd690b638f4266b5e37913510f545b780b9
Lei Yu [Wed, 30 Aug 2017 17:02:21 +0000 (17:02 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Import translations. DO NOT MERGE
am:
ef5d680cc4 -s ours
Change-Id: Ifd5d14c131d2df9f80201145b4cbc244d40b768b
jackqdyulei [Tue, 22 Aug 2017 18:25:30 +0000 (11:25 -0700)]
Add device/profile app check in background check
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code
Bug:
64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac
Bill Yi [Tue, 29 Aug 2017 21:36:06 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I334be8406b13c2b00047753ed84f62cf6ae71fbd
Steven Timotius [Tue, 29 Aug 2017 19:36:42 +0000 (19:36 +0000)]
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
am:
99d524e52b
Change-Id: I5f8c8ef2fa9f1fe8cb2329c7f8603441b26d36a7
TreeHugger Robot [Tue, 29 Aug 2017 19:28:31 +0000 (19:28 +0000)]
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
Matthew Fritze [Tue, 29 Aug 2017 18:51:41 +0000 (18:51 +0000)]
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
am:
3042af11f0
Change-Id: I95fc4f482d864f6bf8283b10236b74bd8cddf9e1
TreeHugger Robot [Tue, 29 Aug 2017 18:42:25 +0000 (18:42 +0000)]
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
Steven Timotius [Wed, 23 Aug 2017 00:47:12 +0000 (17:47 -0700)]
Fix to show correct value for data limit setting
Bug:
64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
(cherry picked from commit
72ebf8fe356bfbca3eeaf7c9b3dfa807c5b458bc)
Matthew Fritze [Wed, 16 Aug 2017 22:45:52 +0000 (15:45 -0700)]
Prevent race condition between SavedQuery and Query Loader
SearchFragment and SavedQueryLoader share a loader manager
and had been using the same loader id for different
loaders.
Occaisionally (in monkey tests) two loaders with the same
IDs would be started and crash when they finished.
The loaders now have different IDs.
Change-Id: I11e9b7365605fbcef44cf7d2323183415422f5c8
Fixes:
64756515
Test: robotests
Sundeep Ghuman [Tue, 29 Aug 2017 04:49:28 +0000 (04:49 +0000)]
Separate multiple DNS addresses with newlines.
am:
2716e841be
Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.
Bug: b/
65037256
Test: make -j40 RunSettingsRoboTests
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
Alex Vakulenko [Mon, 28 Aug 2017 23:45:19 +0000 (23:45 +0000)]
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
am:
6f72b57428
Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf
TreeHugger Robot [Mon, 28 Aug 2017 23:15:26 +0000 (23:15 +0000)]
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
jackqdyulei [Mon, 28 Aug 2017 20:16:04 +0000 (20:16 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
am:
ccbb613fa9
Change-Id: I7307cbd56949ea995906cc47f67afa660f50d0a0
TreeHugger Robot [Mon, 28 Aug 2017 19:55:39 +0000 (19:55 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
Lei Yu [Mon, 28 Aug 2017 17:45:38 +0000 (17:45 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
am:
088393596e
Change-Id: I93f50785f54b1287167f1f87c91167365b295a64
Lei Yu [Mon, 28 Aug 2017 17:35:59 +0000 (17:35 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
* changes:
Add functional test for wakelock anomaly detector
Add functional test for bt anomaly detector
Jack He [Sat, 26 Aug 2017 02:51:48 +0000 (02:51 +0000)]
Bluetooth: Only show devices when their names are resolved
am:
19ba320263
Change-Id: I23300ac9541f88b3aeb978be0771e93b85fe834f
Alex Vakulenko [Sat, 26 Aug 2017 00:44:36 +0000 (17:44 -0700)]
Fix crash in developer settings when backup is not available
When backup feature is disabled, Developer Settings dialog does
not come up due to a crash.
Disable Backup Password option in the preference screen.
Bug:
64725174
Test: Developer settings dialog comes up and Backup password is
disabled on Polaris
Change-Id: I4f4546c4e97d2e5128ec65c0532691d9799b4c8f
Jack He [Thu, 1 Jun 2017 01:37:28 +0000 (18:37 -0700)]
Bluetooth: Only show devices when their names are resolved
* Add a developer menu option to allow name-less devices to be shown
when a Bluetooth developer needs it, but hide it for non-developer
users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
does not have a name besides MAC address and the above developer option
is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
not affect BluetoothSettings. BluetoothSettings will show all paired
devices regardless whether an user friendly name exists.
Bug:
34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5
jackqdyulei [Fri, 25 Aug 2017 21:37:39 +0000 (14:37 -0700)]
Remove subtitle for Recent location apps
Bug:
65011654
Test: Screenshot
Change-Id: I840e6ee8f755b4bbb5392a80224dc5b4b19a8054
jackqdyulei [Thu, 17 Aug 2017 22:06:06 +0000 (15:06 -0700)]
Add functional test for wakelock anomaly detector
Bug:
63815938
Test: runtest -x WakelockAnomalyTest
Change-Id: I4d10d5be8b38264f29c67c2c945fdbbd1090430d
jackqdyulei [Thu, 17 Aug 2017 21:26:01 +0000 (14:26 -0700)]
Add functional test for bt anomaly detector
This cl:
Set up the environment for functional test
1. Update Android.mk by adding instrumentation and libs
2. Update AndroidManifest.xml by adding runner
Add functional test for bt anomaly, with the following workflow
1. reset battery stats
2. pretend unplug and screen off
3. Start AnomalyTester app, set values and click start button
4. Wait its running
5. Check anomaly preference in battery main page
6. reset all parameters
Bug:
63815938
Test: runtest -x BluetoothAnomalyTest
Change-Id: Ief02a314d21f6c32d70729047a1d4bdce9ad9920
jackqdyulei [Fri, 25 Aug 2017 18:37:53 +0000 (18:37 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am:
77bd8c3a73
Change-Id: I36f5729dd042c88c9f8d6a2d4abf720a05748246
TreeHugger Robot [Fri, 25 Aug 2017 18:25:03 +0000 (18:25 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
Daniel Nishi [Fri, 25 Aug 2017 17:09:52 +0000 (17:09 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev
am:
2b53a8467c
Change-Id: I698897d5c21decadfaf437880a81e754939df850
Daniel Nishi [Fri, 25 Aug 2017 16:51:45 +0000 (16:51 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 03:44:25 +0000 (03:44 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev
am:
08fecc4143
Change-Id: Id3125640f4d62da1161b9e894577c6285fe7c83a
Doris Ling [Fri, 25 Aug 2017 03:43:37 +0000 (03:43 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
am:
51c83353fe
Change-Id: I869238f4c9198dbd167ab02d18e41e0e67001c38
TreeHugger Robot [Fri, 25 Aug 2017 03:35:46 +0000 (03:35 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 03:34:34 +0000 (03:34 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 01:49:28 +0000 (01:49 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
am:
4aaacaf7e3
Change-Id: Icc5588c0fde97908d371452c622980fddae054df
TreeHugger Robot [Fri, 25 Aug 2017 01:38:53 +0000 (01:38 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
Sundeep Ghuman [Fri, 25 Aug 2017 00:38:58 +0000 (00:38 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
am:
a253e1d416
Change-Id: I4309bdd864d7da5a0b33e744d28feafe9966012b
TreeHugger Robot [Fri, 25 Aug 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
jackqdyulei [Wed, 9 Aug 2017 16:57:27 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.
If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.
Bug:
63393322
Test: RunSettingsRoboTests
Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Merged-In: Ib21822eafda0e8570212ce5cb070478e4f4876a2
jackqdyulei [Wed, 16 Aug 2017 00:02:58 +0000 (17:02 -0700)]
Add wakelock action in testing app
This cl adds action to hold the wakelock for specific time. With
this action we could test whether wakelock detector is effective.
Bug:
2731722
Test: make -j40 AnomalyTester
Change-Id: I1d44c12363f126ea9b8fc44f4c135e46b898186c
jackqdyulei [Tue, 15 Aug 2017 17:12:14 +0000 (10:12 -0700)]
Add bt anomaly action in testing app
This cl adds the action to start bluttooth unoptimized scanning.
With this action we could test whether bt anomaly detector is
effective.
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I7f41dbb07384fbf3c5a81e460a3629306bc33f59
Daniel Nishi [Thu, 24 Aug 2017 21:24:31 +0000 (21:24 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am:
efcc8be05c
Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321
Doris Ling [Thu, 24 Aug 2017 20:09:57 +0000 (13:09 -0700)]
Fix jank in showing conditions and suggestions in cold start.
When we first initialize the dashboard view, and register the condition
listener, it will trigger the condition changed callback immediately.
This results in unnecessary refresh of the dashboard header. Add check
to not do the refresh when we first initialize the view.
Change-Id: If7c69637463734c150b7f5eb7f3c042cf73837fa
Fixes:
64811475
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 24 Aug 2017 19:27:23 +0000 (19:27 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
Lei Yu [Thu, 24 Aug 2017 17:42:09 +0000 (17:42 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
am:
3949ed53a9
Change-Id: I2cfae5ecff424ff042e0a0b29a610908563b8348
Lei Yu [Thu, 24 Aug 2017 17:41:25 +0000 (17:41 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev
am:
8cac6b07bc
Change-Id: I5be8aab32f4918814ab2273f608b38d4403b24d0
Lei Yu [Thu, 24 Aug 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
Lei Yu [Thu, 24 Aug 2017 17:34:56 +0000 (17:34 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 08:07:20 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
8dce5e57c3 -s ours
Change-Id: I3b749db0e748344dad59f8d9487525320f516bb2
TreeHugger Robot [Thu, 24 Aug 2017 07:49:30 +0000 (07:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Android Build Merger (Role) [Thu, 24 Aug 2017 07:41:50 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE am:
683fdb8177 -s ours am:
1d339fab5f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 07:41:13 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE am:
683fdb8177 -s ours
am:
1d339fab5f -s ours
Change-Id: Ifce1308a8c9524b7ed12037f7c4912b6991c168e
Bill Yi [Thu, 24 Aug 2017 07:41:12 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE am:
683fdb8177 -s ours
am:
89ebaf6c52 -s ours
Change-Id: I2e80906f9c3d4657e9dc1d5dd8aef36f4ce19235
Bill Yi [Thu, 24 Aug 2017 07:37:10 +0000 (07:37 +0000)]
Import translations. DO NOT MERGE
am:
683fdb8177 -s ours
Change-Id: I5b3d3ae77cbda9a3badd40e678034f4ee157b7be
Bill Yi [Thu, 24 Aug 2017 07:37:10 +0000 (07:37 +0000)]
Import translations. DO NOT MERGE
am:
683fdb8177 -s ours
Change-Id: I6d6c17a868765261ace38e0532c95695c2dfb840
Bill Yi [Thu, 24 Aug 2017 05:15:37 +0000 (22:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I452434cbf7282ba20233b9345b75ebdf9251ef98
Bill Yi [Thu, 24 Aug 2017 04:58:28 +0000 (21:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I5ac7b8c39cb58c662a744ac1c0608ed901fb670e
Soroosh Mariooryad [Thu, 24 Aug 2017 04:20:30 +0000 (04:20 +0000)]
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am:
f83b94aa0c
Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c
TreeHugger Robot [Thu, 24 Aug 2017 04:11:48 +0000 (04:11 +0000)]
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
Chien-Yu Chen [Wed, 26 Jul 2017 20:39:34 +0000 (13:39 -0700)]
Settings: Enable HAL HDR+ by default
Test: Settings app
Bug:
63045786
Change-Id: I39ed40a3a74bac13a40c556b9cb60b495955a065
Stephen Chen [Thu, 24 Aug 2017 01:58:48 +0000 (01:58 +0000)]
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
am:
a78eeb2d61
Change-Id: Ide908ed189c110c272cd5535f9fbc99705b8555a
TreeHugger Robot [Thu, 24 Aug 2017 01:43:58 +0000 (01:43 +0000)]
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
Doris Ling [Thu, 24 Aug 2017 00:48:20 +0000 (00:48 +0000)]
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
am:
d94fbbc325
Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
jackqdyulei [Mon, 14 Aug 2017 23:24:50 +0000 (16:24 -0700)]
Add UI components for bluetooth anomaly
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I4584e6ada784d8d87558a5b30cf55e2de33d443a
TreeHugger Robot [Thu, 24 Aug 2017 00:36:43 +0000 (00:36 +0000)]
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
jackqdyulei [Mon, 14 Aug 2017 20:54:22 +0000 (13:54 -0700)]
Set up anomaly test app in settings
This cl set up the basic android framework for anomly test app.
Anomaly test app has the similar architecture compared with
settings api tester.
1. Add Android.mk and AndroidManifest.xml
2. Add blank AnomalyActivity
3. Add related resource files.
Bug:
62602318
Test: make -j40 AnomalyTester
Change-Id: I1d59517c9c2d8d0b8e219e3a67dfae73ca5a968e
jackqdyulei [Wed, 23 Aug 2017 20:11:28 +0000 (20:11 +0000)]
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
am:
0e800978bf
Change-Id: Icf0931c60d62fd9e18bc3cfe2853e965403e7740
jackqdyulei [Wed, 23 Aug 2017 20:01:51 +0000 (20:01 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
am:
d0066e3875
Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
TreeHugger Robot [Wed, 23 Aug 2017 19:57:41 +0000 (19:57 +0000)]
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:38:40 +0000 (19:38 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
jackqdyulei [Tue, 15 Aug 2017 18:01:07 +0000 (11:01 -0700)]
Set preference invisible when no anomaly
In the previous code path, we will create an invisible anomaly preference
and update it to visible if it contains any anomaly. However, when
anomaly is dismissed we don't reset preference to invisible.
So, this cl adds code to set it to invisible explicitly when anomaly list
is empty.
Bug:
64617126
Test: RunSettingsRoboTests
Change-Id: Ie7a3498da91243f05f4c47fb1cc5f67b177d04b1
liming.wang [Thu, 27 Oct 2016 02:00:34 +0000 (10:00 +0800)]
Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
Fixes:
64322876
Test: manual - go to Settings > Security & Location > Fingerprint
and then tap "Learn more"
Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
jackqdyulei [Wed, 23 Aug 2017 02:06:12 +0000 (02:06 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
am:
a097d68c4b
Change-Id: Ib020db1315c7e16f86bc076859187f75d79c87ee
Kevin Chyn [Wed, 23 Aug 2017 01:43:12 +0000 (01:43 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
am:
a6b67d15eb
Change-Id: Icb5ec09a66aadf48a81f33d57aacbb52d05f9c2f
TreeHugger Robot [Wed, 23 Aug 2017 01:42:42 +0000 (01:42 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 00:24:13 +0000 (00:24 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
Amit Mahajan [Wed, 23 Aug 2017 00:07:47 +0000 (00:07 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422 am:
f70f53473a
am:
4bb56f5282
Change-Id: I1862129b9ec0e2c20981586cf29c672f30c2912f
TreeHugger Robot [Tue, 22 Aug 2017 23:48:07 +0000 (23:48 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837 am:
a81a339c1d -s ours
am:
a211db7af3
Change-Id: Icf1a718d443c1f72d1ddcd35c565fd0afa6c6222
Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422
am:
f70f53473a
Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db
TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837
am:
a81a339c1d -s ours
Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a
Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052
am:
b2498bc422
Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac
Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
am:
54eeafa052
Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb
am:
b87acf6837
Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]
Merge changes from topic "Read dun APNs from apn db"
am:
f9390ce1fb
Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]
Merge changes from topic "Read dun APNs from apn db"
* changes:
Change empty apn type in user entered APN to non-read-only types.
Check for null mReadOnlyApnTypes.
Disallow adding/editing dun APNs unless allowed by carrier.
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
Tony Mak [Tue, 22 Aug 2017 18:21:35 +0000 (18:21 +0000)]
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am:
e040ef4a39
Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug:
38186417
Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]
Disallow adding/editing dun APNs unless allowed by carrier.
Test: WIP
Bug:
38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
TreeHugger Robot [Tue, 22 Aug 2017 18:04:00 +0000 (18:04 +0000)]
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
Soroosh Mariooryad [Tue, 8 Aug 2017 18:21:32 +0000 (11:21 -0700)]
Extending SearchFeatureProvider API to provide timeout
Bug:
38197948
Test: RunSettingsRoboTests
Change-Id: I5b04085ba93061dafe8977b42ebe5092bc9a9d09