OSDN Git Service
Baligh Uddin [Thu, 18 Apr 2013 03:49:20 +0000 (20:49 -0700)]
am
51a860fe: am
4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
51a860fe9b96685802377c6229bcbcb42b866b59':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 03:45:06 +0000 (20:45 -0700)]
am
4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
4e8cbb32a2ecef9c0bbdaaeb97e6fc29ec14a902':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 03:42:09 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 18 Apr 2013 03:41:23 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 02:29:14 +0000 (19:29 -0700)]
am
8d37841e: am
ebd61e36: Ensure WFD switch is removed along with settings fragment.
* commit '
8d37841e26e6acca91d7c3d147f380d891e31cca':
Ensure WFD switch is removed along with settings fragment.
Jeff Brown [Thu, 18 Apr 2013 02:26:20 +0000 (19:26 -0700)]
am
ebd61e36: Ensure WFD switch is removed along with settings fragment.
* commit '
ebd61e36b2de03e5ccf2ab590cc44c817a3888ff':
Ensure WFD switch is removed along with settings fragment.
Jeff Brown [Thu, 18 Apr 2013 02:22:05 +0000 (19:22 -0700)]
Ensure WFD switch is removed along with settings fragment.
Bug:
8340072
Change-Id: I8d203725ef1bfa5b1b5e5c224fa57d5feaa9db5a
Jim Miller [Wed, 17 Apr 2013 20:43:08 +0000 (13:43 -0700)]
am
71732616: am
cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '
717326167bcf95ef64c8bf6f26a5b475fa1fddf9':
Move owner info from Settings.Secure to LockSettings
Jim Miller [Wed, 17 Apr 2013 20:40:55 +0000 (13:40 -0700)]
am
cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '
cf00931c09a39e89806649a69c96a98bd7619368':
Move owner info from Settings.Secure to LockSettings
Jim Miller [Wed, 17 Apr 2013 20:37:29 +0000 (20:37 +0000)]
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
Amith Yamasani [Wed, 17 Apr 2013 18:34:29 +0000 (11:34 -0700)]
am
05f5437a: am
5ee17505: Changes to deal with restrictions API change
* commit '
05f5437af1d7a6fa5ca27f9cadef0521c05ae09d':
Changes to deal with restrictions API change
Amith Yamasani [Wed, 17 Apr 2013 18:30:42 +0000 (11:30 -0700)]
am
5ee17505: Changes to deal with restrictions API change
* commit '
5ee175051951d3a0bc1533aece69af520c295d37':
Changes to deal with restrictions API change
Baligh Uddin [Wed, 17 Apr 2013 18:18:30 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46b94a6c07511edfbac1fe38edee77c46e14c2cd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 17 Apr 2013 18:15:26 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04afe54c24573ae6980c1140aede0e0d3b0a06f8
Auto-generated-cl: translation import
Amith Yamasani [Wed, 17 Apr 2013 17:47:34 +0000 (10:47 -0700)]
Changes to deal with restrictions API change
Bug:
8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
Amith Yamasani [Tue, 16 Apr 2013 23:01:49 +0000 (16:01 -0700)]
am
ed89cb87: am
e11a346f: Remove wifi/bt restrictions choice for limited users
* commit '
ed89cb8765154506cc712482ef3b6fcb804375f4':
Remove wifi/bt restrictions choice for limited users
Amith Yamasani [Tue, 16 Apr 2013 22:59:01 +0000 (15:59 -0700)]
am
e11a346f: Remove wifi/bt restrictions choice for limited users
* commit '
e11a346f1fe6adeb183e7dfb622ac6ab40016794':
Remove wifi/bt restrictions choice for limited users
Amith Yamasani [Tue, 16 Apr 2013 22:39:47 +0000 (15:39 -0700)]
Remove wifi/bt restrictions choice for limited users
Bug:
8631653
Make "Unknown sources" visible but disabled if restricted for limited user.
Bug:
8629605
Also show the restriction name as the dialog title in the picker.
Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
Amith Yamasani [Tue, 16 Apr 2013 13:45:58 +0000 (06:45 -0700)]
am
b7e49231: am
c1e3983b: Merge "Fix NullPointerException at RunningState"
* commit '
b7e49231ff8c03120c80a28edc43eca83266497b':
Fix NullPointerException at RunningState
Amith Yamasani [Tue, 16 Apr 2013 13:45:57 +0000 (06:45 -0700)]
am
728b6316: am
91b5fab9: Merge "Check if the Activity is finishing before showDialog()"
* commit '
728b631653bfe5b9f69ad9c3d94819f06aa0f5fc':
Check if the Activity is finishing before showDialog()
Amith Yamasani [Tue, 16 Apr 2013 13:43:05 +0000 (06:43 -0700)]
am
c1e3983b: Merge "Fix NullPointerException at RunningState"
* commit '
c1e3983b319ae4998ede94742db5462d01f53b73':
Fix NullPointerException at RunningState
Amith Yamasani [Tue, 16 Apr 2013 13:43:04 +0000 (06:43 -0700)]
am
91b5fab9: Merge "Check if the Activity is finishing before showDialog()"
* commit '
91b5fab9b0e8338850fe2838311a0801fddf31d4':
Check if the Activity is finishing before showDialog()
Amith Yamasani [Tue, 16 Apr 2013 13:16:17 +0000 (13:16 +0000)]
Merge "Fix NullPointerException at RunningState"
Amith Yamasani [Tue, 16 Apr 2013 13:13:52 +0000 (13:13 +0000)]
Merge "Check if the Activity is finishing before showDialog()"
Jim Miller [Tue, 16 Apr 2013 03:27:55 +0000 (20:27 -0700)]
Move owner info from Settings.Secure to LockSettings
Fixes bug
8512972
Change-Id: I3eb68ace44c51daa012547908e28544a2d94847d
Kenny Root [Mon, 15 Apr 2013 20:52:56 +0000 (13:52 -0700)]
am
d56e4ad7: am
1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev
* commit '
d56e4ad7738f588835c464d2e49f80114758e4bf':
Remove old KeyStore API call sites
Kenny Root [Mon, 15 Apr 2013 20:49:51 +0000 (13:49 -0700)]
am
1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev
* commit '
1a72d9c49b11355135af6807d316e473d7d2423e':
Remove old KeyStore API call sites
Kenny Root [Mon, 15 Apr 2013 20:45:16 +0000 (20:45 +0000)]
Merge "Remove old KeyStore API call sites" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 20:04:48 +0000 (13:04 -0700)]
am
a9e23a52: am
cc41daba: Import translations. DO NOT MERGE
* commit '
a9e23a52e1d8935bbe2f344e2d7edee43441ebd7':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 20:00:55 +0000 (13:00 -0700)]
am
cc41daba: Import translations. DO NOT MERGE
* commit '
cc41daba492503c6ea6ffad27691197f7165dce1':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 19:56:33 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 15 Apr 2013 18:15:51 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1ca56661136c6d96224f8da56e9535e84b2f518
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Apr 2013 18:12:49 +0000 (11:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5a4c8320ec06c7aee2eeb272fc62939a7b63cce
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 15 Apr 2013 17:53:12 +0000 (10:53 -0700)]
am
a53807dd: Reconcile with jb-mr2-release - do not merge
* commit '
a53807ddd815be36f0992576f2260f486206766d':
The Android Open Source Project [Mon, 15 Apr 2013 17:46:27 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie31f29c0b7587e4567140530b6f8bd199b0e5a79
The Android Automerger [Mon, 15 Apr 2013 12:56:22 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Sun, 14 Apr 2013 01:51:53 +0000 (18:51 -0700)]
am
9217185d: am
c39dcc1c: Don\'t show developer options to secondary users
* commit '
9217185d74dad396ea87e4b82597c0fe2d949efe':
Don't show developer options to secondary users
Amith Yamasani [Sun, 14 Apr 2013 01:48:49 +0000 (18:48 -0700)]
am
c39dcc1c: Don\'t show developer options to secondary users
* commit '
c39dcc1ce4d1885ef1de926b67e88cf2dd1acaff':
Don't show developer options to secondary users
Amith Yamasani [Sun, 14 Apr 2013 01:30:59 +0000 (18:30 -0700)]
Don't show developer options to secondary users
Show just a message that developer options are not available for the user.
Also fix silent exit of AddAccount operation by showing a toast that user
cannot add accounts.
Bug:
7409523
Bug:
8519646
Bug:
7304007
Change-Id: Id3f430d568d6b7151ac55f86dbc0ef91803fa10c
Amith Yamasani [Sat, 13 Apr 2013 22:58:34 +0000 (15:58 -0700)]
am
c36b3969: am
34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev
* commit '
c36b39696cd4110c7161f375e59d2486013b7355':
Disable apps that require an account on a limited user
Amith Yamasani [Sat, 13 Apr 2013 22:56:28 +0000 (15:56 -0700)]
am
34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev
* commit '
34a62601adf20482d88c153b13d51074a9f3ae5a':
Disable apps that require an account on a limited user
Amith Yamasani [Sat, 13 Apr 2013 22:54:18 +0000 (22:54 +0000)]
Merge "Disable apps that require an account on a limited user" into jb-mr2-dev
Amith Yamasani [Sat, 13 Apr 2013 00:56:34 +0000 (17:56 -0700)]
Disable apps that require an account on a limited user
If an app is marked as requiring an account to work, disable that app
and show a message in the summary.
Also, implement graying out of icons for deselected apps.
Bug:
8600261
Change-Id: I9cf48832675c24257e09addad4316249082c30fb
Kenny Root [Sat, 13 Apr 2013 00:34:13 +0000 (17:34 -0700)]
Remove old KeyStore API call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug:
8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
Baligh Uddin [Fri, 12 Apr 2013 23:15:55 +0000 (16:15 -0700)]
am
6b634ceb: am
8054254a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
6b634ceb56d9fde004984764fed3257e828f8430':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:11:34 +0000 (16:11 -0700)]
am
8054254a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
8054254a8aa73e8aefe019149c9ce37702496ee8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:07:05 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 12 Apr 2013 23:06:30 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Maggie Benthall [Fri, 12 Apr 2013 21:38:47 +0000 (14:38 -0700)]
am
5cc298c8: am
8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev
* commit '
5cc298c838e8fa6dd540624fa354e7d2fab16f92':
Implement Settings app UX for when a user has wifi config locked down.
Maggie Benthall [Fri, 12 Apr 2013 21:34:52 +0000 (14:34 -0700)]
am
8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev
* commit '
8c32c28f1909393bd01a34fb966b23caba9e69da':
Implement Settings app UX for when a user has wifi config locked down.
Maggie Benthall [Fri, 12 Apr 2013 21:28:18 +0000 (21:28 +0000)]
Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev
Emily Bernier [Fri, 12 Apr 2013 20:29:32 +0000 (13:29 -0700)]
am
0e34529c: am
91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
* commit '
0e34529c2a01e5cd9d8aaf499e7777a41411c26b':
User restrictions for creds storage & user removal
Emily Bernier [Fri, 12 Apr 2013 20:25:55 +0000 (13:25 -0700)]
am
91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
* commit '
91d40b7d972a0b5b8591c36f74f8aad38d82c796':
User restrictions for creds storage & user removal
Emily Bernier [Fri, 12 Apr 2013 20:22:03 +0000 (20:22 +0000)]
Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
Amith Yamasani [Fri, 12 Apr 2013 18:06:58 +0000 (11:06 -0700)]
am
a01f625f: am
35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev
* commit '
a01f625f509b0491398b854c1f63562c80902330':
Embed the app restrictions fragment in the dual-pane settings.
Amith Yamasani [Fri, 12 Apr 2013 18:02:23 +0000 (11:02 -0700)]
am
35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev
* commit '
35f02378710a0fd33bf62d2d10e0c655fe07d519':
Embed the app restrictions fragment in the dual-pane settings.
Baligh Uddin [Fri, 12 Apr 2013 17:59:11 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2925e861248befe59ee0a356424786a616774f6
Auto-generated-cl: translation import
Amith Yamasani [Fri, 12 Apr 2013 17:58:03 +0000 (17:58 +0000)]
Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev
Baligh Uddin [Fri, 12 Apr 2013 17:56:21 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55d1e2ad4c165c7098054dadaa79ea3e6896fc89
Auto-generated-cl: translation import
Irfan Sheriff [Fri, 12 Apr 2013 17:38:25 +0000 (10:38 -0700)]
am
2cc2b0f2: am
a2e64ac8: Merge "Limit device name length" into jb-mr2-dev
* commit '
2cc2b0f2cbae003eaca44e12333f754748ddb0c1':
Limit device name length
Irfan Sheriff [Fri, 12 Apr 2013 16:59:41 +0000 (09:59 -0700)]
am
a2e64ac8: Merge "Limit device name length" into jb-mr2-dev
* commit '
a2e64ac8151bafc1f89a6aaa0fa53f049fba21ba':
Limit device name length
Irfan Sheriff [Fri, 12 Apr 2013 16:55:13 +0000 (16:55 +0000)]
Merge "Limit device name length" into jb-mr2-dev
Irfan Sheriff [Fri, 12 Apr 2013 05:26:28 +0000 (22:26 -0700)]
Limit device name length
Bug:
8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76
Amith Yamasani [Fri, 12 Apr 2013 01:21:07 +0000 (18:21 -0700)]
Embed the app restrictions fragment in the dual-pane settings.
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.
Removed the old activity wrapper and moved the logic to UserSettings.
Removed the finish button.
Bug:
8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
Emily Bernier [Thu, 11 Apr 2013 20:24:56 +0000 (16:24 -0400)]
User restrictions for creds storage & user removal
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
Benjamin Poiesz [Thu, 11 Apr 2013 22:18:02 +0000 (15:18 -0700)]
am
2bd65910: am
b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
* commit '
2bd6591025aaf1d1b5a9a9d0d2ce5981617476b3':
Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
Benjamin Poiesz [Thu, 11 Apr 2013 22:15:18 +0000 (15:15 -0700)]
am
b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
* commit '
b0746763ba79f2f002cf68d180bac6ab33e49f8d':
Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
Benjamin Poiesz [Thu, 11 Apr 2013 22:12:10 +0000 (22:12 +0000)]
Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
Amith Yamasani [Thu, 11 Apr 2013 21:58:21 +0000 (14:58 -0700)]
am
c077cd8d: am
d8b0d0ed: Make sure Settings app restrictions show up
* commit '
c077cd8dec7fab6b4224c123007789c1869164ed':
Make sure Settings app restrictions show up
Amith Yamasani [Thu, 11 Apr 2013 20:52:50 +0000 (13:52 -0700)]
am
d8b0d0ed: Make sure Settings app restrictions show up
* commit '
d8b0d0ed8e12c1c3f5c44d50ddf3a69aa8a2be72':
Make sure Settings app restrictions show up
Benjamin Poiesz [Thu, 4 Apr 2013 23:14:13 +0000 (16:14 -0700)]
Forcing the settings apk to be built with the zz_ZZ pseudolocale.
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
Bug #
8556677
Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
Maggie Benthall [Thu, 11 Apr 2013 19:45:58 +0000 (15:45 -0400)]
Implement Settings app UX for when a user has wifi config locked down.
When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
"This user is not allowed to configure wireless networks."
Change-Id: I20193b552ea071740686bd9091637459e9b668b5
Amith Yamasani [Thu, 11 Apr 2013 18:12:35 +0000 (11:12 -0700)]
Make sure Settings app restrictions show up
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.
Bug:
8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
The Android Open Source Project [Thu, 11 Apr 2013 14:50:52 +0000 (07:50 -0700)]
am
d8a4eed4: Reconcile with jb-mr2-release - do not merge
* commit '
d8a4eed4889b5b7f2411e5beeb1f138d10b196c9':
The Android Open Source Project [Thu, 11 Apr 2013 14:45:28 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I18995b65eb42855a0e4559731b1c180ab12f34f5
Maggie Benthall [Thu, 11 Apr 2013 14:12:06 +0000 (07:12 -0700)]
am
2def3df6: am
3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
* commit '
2def3df600d13000855ce352536b49094d746be4':
Implement Settings app UX for when a user has bluetooth config locked down.
Maggie Benthall [Thu, 11 Apr 2013 14:08:37 +0000 (07:08 -0700)]
am
3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
* commit '
3c3fa0ccb8bf9f62558202e909cc158a2e673e37':
Implement Settings app UX for when a user has bluetooth config locked down.
Maggie Benthall [Thu, 11 Apr 2013 14:04:39 +0000 (14:04 +0000)]
Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
The Android Automerger [Thu, 11 Apr 2013 12:55:58 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Thu, 11 Apr 2013 05:16:15 +0000 (22:16 -0700)]
am
7805d74c: am
d81a3f73: Improve app list for limited users
* commit '
7805d74cd7710c868bdebae872c79470b622c86f':
Improve app list for limited users
Amith Yamasani [Thu, 11 Apr 2013 05:13:09 +0000 (22:13 -0700)]
am
d81a3f73: Improve app list for limited users
* commit '
d81a3f73680372ba93a2a26a445d148220c1a521':
Improve app list for limited users
Amith Yamasani [Thu, 11 Apr 2013 04:59:18 +0000 (21:59 -0700)]
Improve app list for limited users
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.
Bug:
8520813 lowercase app names
Bug:
8520185 apps installed only in limited user
Bug:
8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
Svetoslav [Thu, 11 Apr 2013 01:22:49 +0000 (18:22 -0700)]
am
fce2148f: am
96cd9e7c: First accessibility device disabled if enableing a second one is canceled.
* commit '
fce2148f3c679ef12ee59a8dcf071e34cea100f5':
First accessibility device disabled if enableing a second one is canceled.
Svetoslav [Thu, 11 Apr 2013 00:56:25 +0000 (17:56 -0700)]
am
96cd9e7c: First accessibility device disabled if enableing a second one is canceled.
* commit '
96cd9e7cc7d830756f42aa715e0062f938d4ae55':
First accessibility device disabled if enableing a second one is canceled.
Svetoslav [Thu, 11 Apr 2013 00:33:37 +0000 (17:33 -0700)]
First accessibility device disabled if enableing a second one is canceled.
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.
bug:
7716830
Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
Dianne Hackborn [Wed, 10 Apr 2013 21:18:56 +0000 (14:18 -0700)]
am
5d46a54c: am
8c94273c: Merge "Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
* commit '
5d46a54c55a4e48332905bd927c24bc2544e2893':
Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats
Dianne Hackborn [Wed, 10 Apr 2013 21:16:34 +0000 (14:16 -0700)]
am
8c94273c: Merge "Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
* commit '
8c94273c73480c35ee0af8910b32f0d4dec48132':
Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats
Dianne Hackborn [Wed, 10 Apr 2013 21:14:22 +0000 (21:14 +0000)]
Merge "Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 20:03:31 +0000 (13:03 -0700)]
am
8059d27e: am
fdc5489b: Import translations. DO NOT MERGE
* commit '
8059d27e73e89fd207ddbd3688c28b0dade11d78':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:00:33 +0000 (13:00 -0700)]
am
fdc5489b: Import translations. DO NOT MERGE
* commit '
fdc5489b56a0432b1b05fd2cc36d8b729d9fabf5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:56:32 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Wed, 10 Apr 2013 19:50:32 +0000 (12:50 -0700)]
Fix issue #
7691456: adbd CPU usage identified as Bluetooth in battery stats
Should be comparing with Bluetooth UID, not the wrong and broken GID.
Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
Baligh Uddin [Wed, 10 Apr 2013 18:30:34 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b91f9699560cd2f7a4858c9b96c8782a6a0601
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:27:46 +0000 (11:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 10 Apr 2013 17:08:20 +0000 (10:08 -0700)]
am
122bfe4f: Reconcile with jb-mr2-release - do not merge
* commit '
122bfe4f0495c22f1c18e4d79d7d20c2f3795114':
Potential fix for a monkey-related NPE
The Android Open Source Project [Wed, 10 Apr 2013 17:06:01 +0000 (10:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a
The Android Automerger [Wed, 10 Apr 2013 12:56:49 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Wed, 10 Apr 2013 00:33:13 +0000 (17:33 -0700)]
am
0c8f9246: am
80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev
* commit '
0c8f9246437234a0de217feb339c5811012bea5c':
Select text in user name dialog
Amith Yamasani [Wed, 10 Apr 2013 00:30:51 +0000 (17:30 -0700)]
am
80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev
* commit '
80b1dfe46a85e3ecdbeca5575c205086e5ab07e0':
Select text in user name dialog
Amith Yamasani [Wed, 10 Apr 2013 00:29:12 +0000 (00:29 +0000)]
Merge "Select text in user name dialog" into jb-mr2-dev
OSDN Git Service
