OSDN Git Service
Wink Saville [Fri, 28 Sep 2012 01:16:04 +0000 (18:16 -0700)]
am
b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
* commit '
b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
Wink Saville [Fri, 28 Sep 2012 01:14:45 +0000 (18:14 -0700)]
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
Wink Saville [Thu, 27 Sep 2012 23:16:15 +0000 (16:16 -0700)]
Fix an NPE in WifiSettings.
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug:
7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
Amith Yamasani [Thu, 27 Sep 2012 23:08:39 +0000 (16:08 -0700)]
am
48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
* commit '
48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
Rename "Owner info" to "User info" for secondary users
Amith Yamasani [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
Russell Brenner [Thu, 27 Sep 2012 22:16:56 +0000 (15:16 -0700)]
am
2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
* commit '
2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
Move super call to top of onActivityCreated
Russell Brenner [Thu, 27 Sep 2012 22:14:26 +0000 (15:14 -0700)]
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 21:50:13 +0000 (14:50 -0700)]
Rename "Owner info" to "User info" for secondary users
Bug:
7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
Adam Cohen [Thu, 27 Sep 2012 20:16:36 +0000 (13:16 -0700)]
am
f4b6a682: Merge "Addressing issue
7243210, can\'t set status widget properly" into jb-mr1-dev
* commit '
f4b6a68215a0269837b73f134ff57cf150bc1d9c':
Addressing issue
7243210, can't set status widget properly
Adam Cohen [Thu, 27 Sep 2012 20:14:17 +0000 (13:14 -0700)]
Merge "Addressing issue
7243210, can't set status widget properly" into jb-mr1-dev
Robert Greenwalt [Thu, 27 Sep 2012 20:12:57 +0000 (13:12 -0700)]
am
fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
* commit '
fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
Precreate a data structure so it's never null.
Robert Greenwalt [Thu, 27 Sep 2012 20:10:44 +0000 (13:10 -0700)]
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
Adam Cohen [Thu, 27 Sep 2012 20:04:00 +0000 (13:04 -0700)]
Addressing issue
7243210, can't set status widget properly
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
Robert Greenwalt [Thu, 27 Sep 2012 18:21:12 +0000 (11:21 -0700)]
Precreate a data structure so it's never null.
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:
7084178
Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
Baligh Uddin [Thu, 27 Sep 2012 17:05:42 +0000 (10:05 -0700)]
am
bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bfb5fa9ec37d58101febd13a334707f8f7e341f5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Sep 2012 17:03:48 +0000 (10:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Thu, 27 Sep 2012 16:59:34 +0000 (09:59 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I760c1f8381bb21e4f5f3b492b18a0e6d27dd531a
The Android Automerger [Thu, 27 Sep 2012 14:00:27 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 05:02:48 +0000 (22:02 -0700)]
am
04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
* commit '
04c4ec607affecc16e3032327288f890bddad3db':
Show warning dialog in a multiuser system when adding a new account.
Amith Yamasani [Thu, 27 Sep 2012 05:01:18 +0000 (22:01 -0700)]
Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
Jeff Sharkey [Thu, 27 Sep 2012 03:16:54 +0000 (20:16 -0700)]
am
3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev
* commit '
3db14139205d762ccf544c20ee2b4a04dd4de0da':
Clean up Global settings stragglers.
Jeff Sharkey [Thu, 27 Sep 2012 03:15:19 +0000 (20:15 -0700)]
Merge "Clean up Global settings stragglers." into jb-mr1-dev
Baligh Uddin [Thu, 27 Sep 2012 01:51:25 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76
Auto-generated-cl: translation import
Amith Yamasani [Thu, 27 Sep 2012 00:57:15 +0000 (17:57 -0700)]
Show warning dialog in a multiuser system when adding a new account.
Bug:
7207092
Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
Jeff Brown [Thu, 27 Sep 2012 00:28:50 +0000 (17:28 -0700)]
am
74c1d328: Avoid using hardcoded strings.
* commit '
74c1d328e2e75265a2b106ef66618cf1eb60c914':
Avoid using hardcoded strings.
Jeff Sharkey [Thu, 27 Sep 2012 00:11:43 +0000 (17:11 -0700)]
Clean up Global settings stragglers.
Bug:
7242121
Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
Jeff Brown [Wed, 26 Sep 2012 20:36:53 +0000 (13:36 -0700)]
Avoid using hardcoded strings.
Bug:
7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
Chris Wren [Wed, 26 Sep 2012 20:19:53 +0000 (13:19 -0700)]
am
99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev
* commit '
99f98bb14607240a0e05997a18770912ade1587e':
show the dream enable switch in all conditions.
Chris Wren [Wed, 26 Sep 2012 20:18:01 +0000 (13:18 -0700)]
Merge "show the dream enable switch in all conditions." into jb-mr1-dev
Chris Wren [Wed, 26 Sep 2012 18:39:05 +0000 (14:39 -0400)]
show the dream enable switch in all conditions.
Bug:
7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
Amith Yamasani [Wed, 26 Sep 2012 18:50:14 +0000 (11:50 -0700)]
am
6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
* commit '
6f2ca5bc71d9afc531b60762b8676cacdb96fcaa':
Show more security settings, and fix missing summary in widget selection.
Amith Yamasani [Wed, 26 Sep 2012 18:47:32 +0000 (11:47 -0700)]
Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
John Spurlock [Wed, 26 Sep 2012 18:19:57 +0000 (11:19 -0700)]
am
d33caa4d: Dream settings now looks for the settings activity in xml.
* commit '
d33caa4dea521677431f86e719ac1df290a24c69':
Dream settings now looks for the settings activity in xml.
John Spurlock [Wed, 26 Sep 2012 16:40:54 +0000 (12:40 -0400)]
Dream settings now looks for the settings activity in xml.
Uses the new api for obtaining dream metadata, no longer looks
for the settings activity using the old metadata key.
Bug:
7172816
Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
The Android Open Source Project [Wed, 26 Sep 2012 16:08:37 +0000 (09:08 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5722eee1f2907148388f35abfa36517177ca8f50
John Spurlock [Wed, 26 Sep 2012 15:24:51 +0000 (08:24 -0700)]
am
49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
* commit '
49dc9825569d0c555466303d7d78f1bc75e1602b':
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
John Spurlock [Wed, 26 Sep 2012 15:16:34 +0000 (11:16 -0400)]
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.
Bug:
7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
The Android Automerger [Wed, 26 Sep 2012 14:00:18 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Wed, 26 Sep 2012 05:17:33 +0000 (22:17 -0700)]
Show more security settings, and fix missing summary in widget selection.
Bug:
7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
Baligh Uddin [Wed, 26 Sep 2012 04:13:33 +0000 (21:13 -0700)]
am
bf7fe20d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bf7fe20d5b66e30523a3ba7c84a69350709644d5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Sep 2012 04:12:29 +0000 (21:12 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Wed, 26 Sep 2012 01:19:14 +0000 (18:19 -0700)]
am
12fda43f: Merge "Show long message for a new user only once." into jb-mr1-dev
* commit '
12fda43f8564968cc93d0f8b5839fd520d33577d':
Show long message for a new user only once.
Svetoslav Ganov [Wed, 26 Sep 2012 01:17:15 +0000 (18:17 -0700)]
Merge "Show long message for a new user only once." into jb-mr1-dev
Jeff Brown [Tue, 25 Sep 2012 03:33:51 +0000 (20:33 -0700)]
Fix regression in Bluetooth settings.
Bug:
7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
Amith Yamasani [Wed, 26 Sep 2012 00:21:15 +0000 (17:21 -0700)]
am
0d9179c4: Merge "You section title for current user details" into jb-mr1-dev
* commit '
0d9179c47338532bb2995130d07e458ab12bcb5c':
You section title for current user details
Amith Yamasani [Wed, 26 Sep 2012 00:18:21 +0000 (17:18 -0700)]
Merge "You section title for current user details" into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:07:48 +0000 (17:07 -0700)]
am
209898da: Merge "Update references to migrated global settings." into jb-mr1-dev
* commit '
209898da754a0455864a9251723cb3ab91f36e46':
Update references to migrated global settings.
Jeff Brown [Wed, 26 Sep 2012 00:07:41 +0000 (17:07 -0700)]
am
6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
* commit '
6a5e32a658ac62e72092e3b5d8fb3b99cc4b5158':
Move OVERLAY_DISPLAY_DEVICES to Global.
Jeff Brown [Wed, 26 Sep 2012 00:03:21 +0000 (17:03 -0700)]
Merge "Update references to migrated global settings." into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:03:16 +0000 (17:03 -0700)]
Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
Jeff Brown [Tue, 25 Sep 2012 23:30:55 +0000 (16:30 -0700)]
am
cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
* commit '
cd207ad437085fe3757259bd708fe74f68179094':
Fix regression in Bluetooth settings.
Jeff Brown [Tue, 25 Sep 2012 23:24:59 +0000 (16:24 -0700)]
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
Svetoslav Ganov [Tue, 25 Sep 2012 23:11:16 +0000 (16:11 -0700)]
Show long message for a new user only once.
1. We show a longer message only for the first added user. The
longer message will be shown until the user has been created,
which is until the creator pokes the OK button in the create
new user dialog.
bug:
7210780
Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
Baligh Uddin [Tue, 25 Sep 2012 23:09:15 +0000 (16:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633
Auto-generated-cl: translation import
Amith Yamasani [Tue, 25 Sep 2012 22:47:08 +0000 (15:47 -0700)]
You section title for current user details
Bug:
7232244
Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
Jeff Brown [Tue, 25 Sep 2012 22:01:02 +0000 (15:01 -0700)]
Update references to migrated global settings.
Bug:
7231172
Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
Jeff Brown [Tue, 25 Sep 2012 22:21:40 +0000 (15:21 -0700)]
Move OVERLAY_DISPLAY_DEVICES to Global.
Bug:
7127417
Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
Michael Jurka [Tue, 25 Sep 2012 21:35:31 +0000 (14:35 -0700)]
am
16398c9c: UI refinements to security screen widgets interface
* commit '
16398c9c973ba16a14455c4eee9ca162e0273792':
UI refinements to security screen widgets interface
Michael Jurka [Tue, 25 Sep 2012 00:30:17 +0000 (17:30 -0700)]
UI refinements to security screen widgets interface
Bug #
7158868
Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
The Android Automerger [Tue, 25 Sep 2012 14:00:27 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Tue, 25 Sep 2012 03:33:51 +0000 (20:33 -0700)]
Fix regression in Bluetooth settings.
Bug:
7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
Adam Cohen [Sat, 22 Sep 2012 01:52:24 +0000 (18:52 -0700)]
Addressing issue where power control widget disappears issue
7205586
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
Chris Wren [Mon, 24 Sep 2012 21:38:56 +0000 (14:38 -0700)]
am
8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
* commit '
8bea3c3fb8b3ecbb33fbd5b159faaa7d229e7cf1':
move remaining dock settings into sound settings fragment.
Chris Wren [Mon, 24 Sep 2012 21:37:23 +0000 (14:37 -0700)]
Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
Adam Cohen [Mon, 24 Sep 2012 21:10:37 +0000 (14:10 -0700)]
am
85d4b5f7: Ensuring that keyguard widgets are bound with correct options
* commit '
85d4b5f78e831fdfe6da39f6edafd32c7d63dfea':
Ensuring that keyguard widgets are bound with correct options
Adam Cohen [Mon, 24 Sep 2012 20:15:14 +0000 (13:15 -0700)]
Ensuring that keyguard widgets are bound with correct options
-> We need to bind the widget and indicate that it is a keyguard widget
Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
Jeff Sharkey [Mon, 24 Sep 2012 20:11:19 +0000 (13:11 -0700)]
am
ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
* commit '
ff571fee86267348e852a07826ffc78cc43384ba':
Hide lockdown VPN when IMS auth is required.
Jeff Sharkey [Mon, 24 Sep 2012 20:08:56 +0000 (13:08 -0700)]
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
Chris Wren [Mon, 24 Sep 2012 18:23:46 +0000 (14:23 -0400)]
move remaining dock settings into sound settings fragment.
Bug:
7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
Jeff Sharkey [Mon, 24 Sep 2012 19:56:29 +0000 (12:56 -0700)]
Hide lockdown VPN when IMS auth is required.
Bug:
7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
Adam Cohen [Mon, 24 Sep 2012 18:51:19 +0000 (11:51 -0700)]
am
c939735b: Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
* commit '
c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
Addressing issue where power control widget disappears issue
7205586
Adam Cohen [Mon, 24 Sep 2012 18:49:23 +0000 (11:49 -0700)]
Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
The Android Open Source Project [Mon, 24 Sep 2012 17:13:39 +0000 (10:13 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I736712a26a0e9991d500f7f654eb12dbbd511db4
Amith Yamasani [Mon, 24 Sep 2012 16:26:01 +0000 (09:26 -0700)]
am
7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
* commit '
7fb91855b05b312e45bfded72d48e0cffcee4a44':
Show more settings and add restrictions/dialogs for secondary users
Jeff Sharkey [Mon, 24 Sep 2012 16:26:00 +0000 (09:26 -0700)]
am
0e9cf8a7: Storage item to represent cached data.
* commit '
0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
Baligh Uddin [Mon, 24 Sep 2012 16:25:58 +0000 (09:25 -0700)]
am
b1055311: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Sep 2012 16:25:57 +0000 (09:25 -0700)]
am
17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
* commit '
17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.
Romain Guy [Mon, 24 Sep 2012 16:25:56 +0000 (09:25 -0700)]
am
70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
* commit '
70edd393bf6590647c12808e20efa928eba96705':
Add new developer setting to visualize overdraw
Svetoslav Ganov [Mon, 24 Sep 2012 16:25:55 +0000 (09:25 -0700)]
am
f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev
* commit '
f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
The Android Automerger [Mon, 24 Sep 2012 13:59:22 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 24 Sep 2012 02:00:18 +0000 (19:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Mon, 24 Sep 2012 01:47:19 +0000 (18:47 -0700)]
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
Amith Yamasani [Sun, 23 Sep 2012 19:54:14 +0000 (12:54 -0700)]
Show more settings and add restrictions/dialogs for secondary users
Bug:
7213029 crash in About>Status
Bug:
7212495 hide System updates for second user
Bug:
7212230 nickname editor should select the text
Bug:
7160487 TTS settings
Bug:
7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Jeff Sharkey [Mon, 24 Sep 2012 00:40:47 +0000 (17:40 -0700)]
Storage item to represent cached data.
When touched, offers to clear all cached data.
Bug:
7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
Baligh Uddin [Sun, 23 Sep 2012 15:14:05 +0000 (08:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 23 Sep 2012 15:13:38 +0000 (08:13 -0700)]
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
Baligh Uddin [Sat, 22 Sep 2012 21:20:39 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
The Android Automerger [Sat, 22 Sep 2012 16:42:44 +0000 (09:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
John Spurlock [Sat, 22 Sep 2012 14:38:43 +0000 (10:38 -0400)]
Remove no longer used dream_settings.xml.
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
Romain Guy [Sat, 22 Sep 2012 02:28:11 +0000 (19:28 -0700)]
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
Romain Guy [Sat, 22 Sep 2012 02:23:20 +0000 (19:23 -0700)]
Add new developer setting to visualize overdraw
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
Adam Cohen [Sat, 22 Sep 2012 01:52:24 +0000 (18:52 -0700)]
Addressing issue where power control widget disappears issue
7205586
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
Svetoslav Ganov [Sat, 22 Sep 2012 00:41:31 +0000 (17:41 -0700)]
Merge "Accessibility multi-user support." into jb-mr1-dev
Svetoslav Ganov [Thu, 20 Sep 2012 22:04:55 +0000 (15:04 -0700)]
Accessibility multi-user support.
1. Accessibility settings are now shown for every user.
bug:
6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
Svetoslav Ganov [Sat, 22 Sep 2012 00:15:42 +0000 (17:15 -0700)]
am
0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
* commit '
0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
Svetoslav Ganov [Sat, 22 Sep 2012 00:12:07 +0000 (17:12 -0700)]
Merge "Remove accessibility category from developer options." into jb-mr1-dev
Dianne Hackborn [Sat, 22 Sep 2012 00:07:09 +0000 (17:07 -0700)]
Dianne Hackborn [Sat, 22 Sep 2012 00:05:22 +0000 (17:05 -0700)]
Merge "Fix issue
7198767,
7198366,
7189824." into jb-mr1-dev
Dianne Hackborn [Fri, 21 Sep 2012 23:40:21 +0000 (16:40 -0700)]
Fix issue
7198767,
7198366,
7189824.
Bug #
7198767: Crash on choosing App info from the Recent apps tab
Bug #
7198366: Settings UI should not show other Users' apps
Bug #
7189824: Settings crashes on trying to access Battery usage summary
Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.
Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
Baligh Uddin [Fri, 21 Sep 2012 23:37:25 +0000 (16:37 -0700)]
am
936186c6: Revert "Import translations. DO NOT MERGE"
* commit '
936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
OSDN Git Service
