OSDN Git Service
Benjamin Franz [Thu, 8 Jan 2015 17:40:09 +0000 (17:40 +0000)]
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
Andres Morales [Wed, 7 Jan 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 14:14:40 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
Mikhail Naganov [Wed, 7 Jan 2015 12:33:28 +0000 (12:33 +0000)]
Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:31:55 +0000 (12:31 +0000)]
Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
Mikhail Naganov [Mon, 15 Dec 2014 17:09:50 +0000 (17:09 +0000)]
Add an item to "Legal information" screen for WebView license
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.
Bug:
18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
Sanket Padawe [Tue, 6 Jan 2015 20:46:16 +0000 (20:46 +0000)]
Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
Sanket Padawe [Tue, 6 Jan 2015 18:54:55 +0000 (10:54 -0800)]
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug:
18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
Andres Morales [Tue, 6 Jan 2015 17:38:53 +0000 (09:38 -0800)]
Don't display Write NFC option if no NFC
Bug:
18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
Amith Yamasani [Mon, 5 Jan 2015 20:54:04 +0000 (20:54 +0000)]
Merge "Fix theme for empty activity" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 5 Jan 2015 16:41:35 +0000 (16:41 +0000)]
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
Remove the enable/disable button in certificate setting dialog if restriction
has been put on the respective profile. Also catch security exception just in
case.
Bug:
18899182
Change-Id: Ia247ab264c1b2d08b58456519bf471ba8c727745
Geoff Mendal [Mon, 5 Jan 2015 14:15:47 +0000 (06:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
Benjamin Franz [Fri, 2 Jan 2015 12:52:03 +0000 (12:52 +0000)]
Block BluetoothPermissionRequest notification on managed profiles.
This notification is triggered when a bluetooth device that supports
the PBAP protocol. On managed profiles this functionality is not yet
available and therefore the notification and resulting acvitivity
have no function.
Bug:
18782769
Change-Id: Iaea12eee8ec4727d9448f690861f8344e2296028
Baligh Uddin [Mon, 29 Dec 2014 22:59:54 +0000 (14:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
Prem Kumar [Mon, 29 Dec 2014 13:23:49 +0000 (13:23 +0000)]
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
Sanket Padawe [Tue, 23 Dec 2014 03:35:22 +0000 (03:35 +0000)]
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
Sanket Padawe [Mon, 22 Dec 2014 18:33:49 +0000 (10:33 -0800)]
Fixed settings crash issue while recovering from phone crash.
Bug:
18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
Baligh Uddin [Mon, 22 Dec 2014 16:50:56 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
Maurice Lam [Sat, 20 Dec 2014 01:17:58 +0000 (01:17 +0000)]
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
PauloftheWest [Fri, 19 Dec 2014 22:53:03 +0000 (22:53 +0000)]
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
Maurice Lam [Fri, 19 Dec 2014 19:52:52 +0000 (11:52 -0800)]
[WifiSetup] Fix text colors in dark theme
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug:
18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
PauloftheWest [Thu, 18 Dec 2014 23:02:39 +0000 (15:02 -0800)]
Removed extraneous slot information on single SIM devices.
Bug:
18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
PauloftheWest [Thu, 18 Dec 2014 21:59:04 +0000 (13:59 -0800)]
SIM Status now shows data connection instead of voice.
Bug:
18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
Sanket Padawe [Thu, 18 Dec 2014 18:29:16 +0000 (10:29 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
Amith Yamasani [Wed, 17 Dec 2014 18:52:52 +0000 (10:52 -0800)]
Fix theme for empty activity
Avoids janky transition when confirmation of device credential
is requested.
Bug:
18637426
Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
Sanket Padawe [Thu, 18 Dec 2014 06:28:08 +0000 (06:28 +0000)]
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 06:24:36 +0000 (06:24 +0000)]
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
This reverts commit
579b66f28da710b5a1e68e211f5bd54ea466ab8b.
Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
Sanket Padawe [Thu, 18 Dec 2014 04:53:33 +0000 (04:53 +0000)]
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 03:31:30 +0000 (19:31 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
Geoff Mendal [Wed, 17 Dec 2014 14:18:00 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
Jason Monk [Tue, 16 Dec 2014 15:44:25 +0000 (15:44 +0000)]
Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 02:42:28 +0000 (02:42 +0000)]
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 02:42:16 +0000 (02:42 +0000)]
Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 22:49:24 +0000 (22:49 +0000)]
Merge "Made the WPS icon visisble." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 22:46:57 +0000 (22:46 +0000)]
Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
Sanket Padawe [Mon, 15 Dec 2014 20:06:17 +0000 (12:06 -0800)]
Prevent sim notify popup after upgrade from k to LMR1.
Bug:
18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
Wink Saville [Mon, 15 Dec 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 20:04:29 +0000 (12:04 -0800)]
Use getLIn1NumberForSubscriber to get phone number.
Bug:
18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
Stuart Scott [Mon, 15 Dec 2014 19:43:19 +0000 (19:43 +0000)]
Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 19:28:43 +0000 (19:28 +0000)]
Merge "IMEI information will show without a SIM." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 18:54:56 +0000 (10:54 -0800)]
Made the WPS icon visisble.
Bug:
18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
PauloftheWest [Mon, 15 Dec 2014 18:29:54 +0000 (10:29 -0800)]
IMEI information will show without a SIM.
Bug:
18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
Maurice Lam [Mon, 15 Dec 2014 17:44:52 +0000 (17:44 +0000)]
Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
Geoff Mendal [Mon, 15 Dec 2014 14:26:44 +0000 (06:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
Lucky Zhang [Sat, 13 Dec 2014 00:15:31 +0000 (00:15 +0000)]
Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
PauloftheWest [Fri, 12 Dec 2014 17:09:40 +0000 (09:09 -0800)]
Fixed then icons of SIMs in the call dialog.
Bug:
18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
John Spurlock [Fri, 12 Dec 2014 17:54:48 +0000 (12:54 -0500)]
Settings: Allow more lines of saver feature description text.
Bug:
18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
Wink Saville [Fri, 12 Dec 2014 04:23:16 +0000 (04:23 +0000)]
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Maurice Lam [Fri, 12 Dec 2014 02:22:08 +0000 (18:22 -0800)]
[FRP] Open the lock setup screens in same task
Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.
Bug:
18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
Lucky Zhang [Fri, 12 Dec 2014 02:10:01 +0000 (18:10 -0800)]
[FRP] Notification screen slides in wrong direction
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.
This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.
Bug:
18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
Prem Kumar [Fri, 12 Dec 2014 00:52:31 +0000 (00:52 +0000)]
Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
Sanket Padawe [Thu, 11 Dec 2014 23:48:45 +0000 (15:48 -0800)]
Clearing junk layout for add wifi dialog in settings.
Bug:
18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
Sanket Padawe [Thu, 11 Dec 2014 22:36:26 +0000 (14:36 -0800)]
Exiting activity on clicking outside dialog acitivity.
Bug:
18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
Jason Monk [Wed, 10 Dec 2014 22:21:51 +0000 (17:21 -0500)]
Add a periodic check of the tethering provisioning
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.
Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50
Bug:
18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
Wink Saville [Thu, 11 Dec 2014 18:10:05 +0000 (10:10 -0800)]
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 13:23:28 +0000 (13:23 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
PauloftheWest [Thu, 11 Dec 2014 13:14:06 +0000 (13:14 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
PauloftheWest [Wed, 10 Dec 2014 21:54:50 +0000 (13:54 -0800)]
Disabled SIM notifications while provisioning.
Bug:
18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
Stuart Scott [Tue, 2 Dec 2014 22:44:59 +0000 (14:44 -0800)]
Show toast when cellular data option is changing.
bug:
18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
PauloftheWest [Wed, 10 Dec 2014 21:16:10 +0000 (21:16 +0000)]
Merge "Fixed a Data Usage crash" into lmp-mr1-dev
Alexandra Gherghina [Wed, 10 Dec 2014 17:42:41 +0000 (17:42 +0000)]
Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
PauloftheWest [Wed, 10 Dec 2014 16:50:54 +0000 (08:50 -0800)]
Fixed a Data Usage crash
Bug:
18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
Emily Bernier [Wed, 10 Dec 2014 17:25:14 +0000 (17:25 +0000)]
Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 14:24:00 +0000 (06:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
Alexandra Gherghina [Tue, 9 Dec 2014 17:06:39 +0000 (17:06 +0000)]
Fix NPE in Running Processes view in Apps Settings
Bug:
18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
Maurice Lam [Wed, 10 Dec 2014 01:17:14 +0000 (01:17 +0000)]
Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
Emily Bernier [Wed, 10 Dec 2014 01:02:41 +0000 (20:02 -0500)]
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.
Bug:
18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
PauloftheWest [Tue, 9 Dec 2014 23:10:35 +0000 (23:10 +0000)]
Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
PauloftheWest [Tue, 9 Dec 2014 23:04:18 +0000 (23:04 +0000)]
Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
Zoltan Szatmary-Ban [Tue, 9 Dec 2014 19:20:21 +0000 (19:20 +0000)]
Bring up correct app for Recent location list items
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.
Bug:
17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add debug dataEnable." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 23:47:30 +0000 (15:47 -0800)]
[FRP] Shrink lock screen when keyboard pops up
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.
Bug:
18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 21:49:35 +0000 (13:49 -0800)]
Fixed a SIM Lock UI issue
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.
Bug:
18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
John Spurlock [Mon, 8 Dec 2014 20:27:01 +0000 (20:27 +0000)]
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 20:23:34 +0000 (12:23 -0800)]
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug:
18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
John Spurlock [Mon, 8 Dec 2014 20:20:33 +0000 (15:20 -0500)]
Settings: Rebind to volume sliders after returning from stopped.
Bug:
18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
PauloftheWest [Tue, 2 Dec 2014 16:45:00 +0000 (08:45 -0800)]
Added Multi-SIM capability to Access Point Names
+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.
Bug:
18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
Jeff Sharkey [Mon, 8 Dec 2014 17:57:29 +0000 (17:57 +0000)]
Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:35 +0000 (17:01 +0000)]
Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:22 +0000 (17:01 +0000)]
Merge "Fixed a SimSettings issue" into lmp-mr1-dev
Jeff Sharkey [Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)]
Offer to "merge" subscribers for data usage.
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.
Also remove some code related to long-dormant split policies.
Bug:
18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
John Spurlock [Sun, 30 Nov 2014 21:22:09 +0000 (16:22 -0500)]
Settings: Hide downtime settings if not supported.
Depends on frameworks/base:
I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
Bug:
16373455
Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
Geoff Mendal [Mon, 8 Dec 2014 14:25:15 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:50:10 +0000 (12:50 +0000)]
Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:32:00 +0000 (09:32 +0000)]
Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:31:45 +0000 (09:31 +0000)]
Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
Maurice Lam [Sat, 6 Dec 2014 03:03:55 +0000 (03:03 +0000)]
Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev
Lucky Zhang [Fri, 5 Dec 2014 23:00:20 +0000 (15:00 -0800)]
[FRP] Remove None and Swipe from screen lock options
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".
Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.
Bug:
18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
Lucky Zhang [Sat, 6 Dec 2014 02:20:27 +0000 (18:20 -0800)]
[FRP] Screen Lock for Setup Wizard shows wrong title
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".
Bug:
18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
Jeff Davidson [Sat, 6 Dec 2014 02:07:30 +0000 (02:07 +0000)]
Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
Wink Saville [Fri, 5 Dec 2014 23:34:46 +0000 (15:34 -0800)]
Add debug dataEnable.
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
Maurice Lam [Fri, 5 Dec 2014 21:56:59 +0000 (21:56 +0000)]
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:42 +0000 (20:55 +0000)]
Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:28 +0000 (20:55 +0000)]
Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 20:19:05 +0000 (12:19 -0800)]
[FRP] Use Lock type as header instead of "Encryption"
Bug:
18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
Justin Harrison [Fri, 5 Dec 2014 19:41:54 +0000 (19:41 +0000)]
Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 15 Oct 2014 10:35:55 +0000 (11:35 +0100)]
Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location
Bug:
18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
Fyodor Kupolov [Fri, 5 Dec 2014 19:28:42 +0000 (19:28 +0000)]
Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev
Shishir Agrawal [Fri, 5 Dec 2014 19:25:59 +0000 (19:25 +0000)]
Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev