OSDN Git Service
The Android Open Source Project [Thu, 13 Jun 2013 15:22:53 +0000 (08:22 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
The Android Automerger [Thu, 13 Jun 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 01:04:45 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 20:22:08 +0000 (13:22 -0700)]
am
0117cc7c: Import translations. DO NOT MERGE
* commit '
0117cc7ce562569d32fc18341111100068d11eff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 10 Jun 2013 15:14:09 +0000 (08:14 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
The Android Automerger [Sun, 9 Jun 2013 12:55:49 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:19:55 +0000 (10:19 -0700)]
Don't show ApnEditor as a dialog
Else it would be missing the menu buttons.
Bug:
7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
Baligh Uddin [Wed, 5 Jun 2013 18:51:21 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
Amith Yamasani [Thu, 6 Jun 2013 21:48:07 +0000 (14:48 -0700)]
Allow hidden apps to opt-out
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.
Bug:
8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Alex Klyubin [Thu, 6 Jun 2013 22:45:23 +0000 (15:45 -0700)]
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
Amith Yamasani [Fri, 7 Jun 2013 21:55:09 +0000 (14:55 -0700)]
am
f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
* commit '
f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
Don't show ApnEditor as a dialog
Amith Yamasani [Fri, 7 Jun 2013 21:53:15 +0000 (21:53 +0000)]
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
Baligh Uddin [Fri, 7 Jun 2013 19:23:44 +0000 (12:23 -0700)]
am
2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
2db8ca13a781be5489df614a5513240493edaeed':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Jun 2013 19:19:40 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:47:24 +0000 (10:47 -0700)]
am
1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev
* commit '
1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
Allow hidden apps to opt-out
Amith Yamasani [Fri, 7 Jun 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Allow hidden apps to opt-out" into jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:19:55 +0000 (10:19 -0700)]
Don't show ApnEditor as a dialog
Else it would be missing the menu buttons.
Bug:
7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
Alex Klyubin [Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)]
am
681b21f3: resolved conflicts for merge of
5d21820a to jb-mr2-dev
* commit '
681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:45:23 +0000 (15:45 -0700)]
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Alex Klyubin [Thu, 6 Jun 2013 22:43:51 +0000 (15:43 -0700)]
am
56604046: am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
56604046c5c46087aa5320d7c6aa6eb49c313637':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)]
am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
5aa3f8782432c79d01702ca6a7214793501bd476':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)]
am
a65fa934: am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
a65fa934f19ebfe59a8458be733e783292ad8d9c':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:35:34 +0000 (15:35 -0700)]
am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0c32da7ee01f7f523a889c5faf1a449e664f8bce':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:33:46 +0000 (15:33 -0700)]
am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8bfb859e3b81a9b6448c17cfb02a0aa748580231':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:33:45 +0000 (15:33 -0700)]
am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
6f28e3420ade08f05588d35937b772ffb5cdaf83':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8d5aeffa7dc27eba60fe4c64be6a89e645091958':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
9f6a193394de16bfe398c8b7424f273231c77134':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
089d161588f07862ac1e8876a39227e4110b2bec':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:28:53 +0000 (15:28 -0700)]
am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)]
am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:26:49 +0000 (15:26 -0700)]
am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
efd88e2c468db2169ff9bb17f2b89c246756dcda':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:26:48 +0000 (15:26 -0700)]
am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:25:29 +0000 (22:25 +0000)]
Merge "Permit deactivation of malformed Device Admins." into jb-dev
Alex Klyubin [Thu, 6 Jun 2013 21:56:24 +0000 (14:56 -0700)]
Permit deactivation of malformed Device Admins.
Bug:
9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
Amith Yamasani [Thu, 6 Jun 2013 21:48:07 +0000 (14:48 -0700)]
Allow hidden apps to opt-out
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.
Bug:
8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
(cherry picked from commit
d14258e50efc3677abef3cd204b67e7f26e47b56)
Conflicts:
src/com/android/settings/DeviceAdminSettings.java
Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
PackageManager.queryBroadcastReceivers invocation. The above
flag was introduced in API Level 18.
Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
Dianne Hackborn [Thu, 6 Jun 2013 19:54:34 +0000 (12:54 -0700)]
am
adc3a282: am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
adc3a2825c754084728193ebf4f88b411e5b3dbc':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:51:50 +0000 (12:51 -0700)]
am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:35:00 +0000 (12:35 -0700)]
am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)]
am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
f96a86c99d7505e15a39266967cf4d4d75295af1':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:30:51 +0000 (12:30 -0700)]
am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
6d80d477391c6ad14a6bcdb044c3351de4e20481':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:29:04 +0000 (12:29 -0700)]
am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:26:39 +0000 (12:26 -0700)]
am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
5f28c77bc64deb132082eaab0ebd544ba5111bd0':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:23:05 +0000 (12:23 -0700)]
am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
d60861258169083f3174734af821fc8078ec5d2f':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Thu, 6 Jun 2013 18:19:06 +0000 (11:19 -0700)]
am
d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
* commit '
d63bd61ee862db18677276b1a18b2d7938a5e193':
Fix NullPointerException at RunningState
Amith Yamasani [Thu, 6 Jun 2013 18:16:31 +0000 (18:16 +0000)]
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
The Android Open Source Project [Thu, 6 Jun 2013 17:37:41 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I6d5d0cb4778ad82dd1943e6facc621f87b37ac28
Johan Redestig [Fri, 5 Oct 2012 08:33:16 +0000 (10:33 +0200)]
Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.
Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
(cherry picked from commit
8274b6770219a469ab8a5254206d0d81bd5c96d3)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
Baligh Uddin [Wed, 5 Jun 2013 18:51:21 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
The Android Automerger [Wed, 5 Jun 2013 17:21:50 +0000 (10:21 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Mon, 3 Jun 2013 18:48:00 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 21:34:56 +0000 (14:34 -0700)]
am
804b8b60: Import translations. DO NOT MERGE
* commit '
804b8b60e7784ebbf660cf4348de24c1b2ae7146':
Import translations. DO NOT MERGE
The Android Open Source Project [Mon, 3 Jun 2013 21:03:56 +0000 (14:03 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0c4c9a3c4d05abbbde1198c2f4d0ee170a2ef7e5
Baligh Uddin [Mon, 3 Jun 2013 18:48:00 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
The Android Automerger [Sun, 2 Jun 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Sat, 1 Jun 2013 15:23:29 +0000 (08:23 -0700)]
am
eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 May 2013 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jean-Baptiste Queru [Thu, 30 May 2013 22:39:39 +0000 (15:39 -0700)]
am
46cd7f64: Ignore
81476405 from AOSP
* commit '
46cd7f64f00f530de4478137281c4d47d02c9244':
Settings: Fix Swedish translations
Jean-Baptiste Queru [Thu, 30 May 2013 22:37:47 +0000 (15:37 -0700)]
Ignore
81476405 from AOSP
Jean-Baptiste Queru [Thu, 30 May 2013 22:06:37 +0000 (22:06 +0000)]
Merge "Settings: Fix Swedish translations"
Robert Greenwalt [Thu, 30 May 2013 19:06:30 +0000 (12:06 -0700)]
am
5ac90432: Don\'t show scan-always text if it is off.
* commit '
5ac904321d81a0a0b7892c5722c464dc3c693f9f':
Don't show scan-always text if it is off.
Robert Greenwalt [Thu, 30 May 2013 18:33:36 +0000 (11:33 -0700)]
Don't show scan-always text if it is off.
bug:
9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
Baligh Uddin [Thu, 30 May 2013 02:29:10 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 29 May 2013 15:06:16 +0000 (08:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab
The Android Automerger [Wed, 29 May 2013 12:55:30 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 04:00:23 +0000 (21:00 -0700)]
am
1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1182f6755f17753f5b551ea40c11c263801a90c1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 03:56:37 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Russell Brenner [Tue, 28 May 2013 20:23:35 +0000 (13:23 -0700)]
am
c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit '
c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
Improved logic for Skip warning message
Russell Brenner [Tue, 28 May 2013 20:22:40 +0000 (20:22 +0000)]
Merge "Improved logic for Skip warning message" into jb-mr2-dev
The Android Open Source Project [Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
Baligh Uddin [Mon, 27 May 2013 18:58:11 +0000 (11:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
The Android Automerger [Sun, 26 May 2013 12:55:43 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Russell Brenner [Fri, 24 May 2013 21:28:08 +0000 (14:28 -0700)]
Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.
Bug:
9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
Baligh Uddin [Thu, 23 May 2013 16:30:23 +0000 (09:30 -0700)]
am
6fa5e627: Import translations. DO NOT MERGE
* commit '
6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 23 May 2013 15:05:45 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
The Android Automerger [Thu, 23 May 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Thu, 23 May 2013 07:31:54 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
Amith Yamasani [Wed, 22 May 2013 22:07:00 +0000 (15:07 -0700)]
am
21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '
21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
Update strings for clarity about restricted profiles
Amith Yamasani [Wed, 22 May 2013 22:04:59 +0000 (22:04 +0000)]
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
Alex Klyubin [Wed, 22 May 2013 21:09:10 +0000 (14:09 -0700)]
am
7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '
7229e29f1749ae10bd92b59ec3d663698a5045e7':
Ensure all active Device Admins are listed.
Alex Klyubin [Wed, 22 May 2013 21:06:32 +0000 (21:06 +0000)]
Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
Dianne Hackborn [Wed, 22 May 2013 21:01:26 +0000 (14:01 -0700)]
am
8274b677: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
8274b6770219a469ab8a5254206d0d81bd5c96d3':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Wed, 22 May 2013 19:51:30 +0000 (12:51 -0700)]
Update strings for clarity about restricted profiles
Bug:
9051422
Bug:
9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
The Android Open Source Project [Wed, 22 May 2013 14:23:09 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
The Android Automerger [Wed, 22 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Wed, 22 May 2013 01:16:50 +0000 (18:16 -0700)]
am
0b2781ae: Write restriction bundle right away for required apps.
* commit '
0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
Write restriction bundle right away for required apps.
Amith Yamasani [Tue, 21 May 2013 23:07:28 +0000 (16:07 -0700)]
Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.
The app entry is also automatically removed from the list if there are no visible
restrictions.
Bug:
9074051
Also fix an incorrect dialog label. Bug:
9068877
Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
The Android Open Source Project [Tue, 21 May 2013 15:59:23 +0000 (08:59 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
The Android Automerger [Tue, 21 May 2013 14:47:00 +0000 (07:47 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Tue, 21 May 2013 01:24:23 +0000 (18:24 -0700)]
am
b514a95c: am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
b514a95ce7009a61532f00d4ac5ab73861d2b327':
No back icon in action bar of APN Settings
Amith Yamasani [Tue, 21 May 2013 01:16:42 +0000 (18:16 -0700)]
am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
No back icon in action bar of APN Settings
Amith Yamasani [Tue, 21 May 2013 00:39:29 +0000 (17:39 -0700)]
am
f88e6e5a: Don\'t mutate all instances of app icons in Settings
* commit '
f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
Don't mutate all instances of app icons in Settings
OSDN Git Service
