Alex Klyubin
60544e74b6
am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
Ensure all active Device Admins are listed.
2013-06-06 15:26:48 -07:00
Alex Klyubin
efd88e2c46
Merge "Permit deactivation of malformed Device Admins." into jb-dev
2013-06-06 22:25:29 +00:00
Alex Klyubin
29de9d5153
Permit deactivation of malformed Device Admins.
...
Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
2013-06-06 14:56:24 -07:00
Amith Yamasani
48b8b8fd18
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
2013-06-06 14:48:07 -07:00
Alex Klyubin
3dddd8cbff
Ensure all active Device Admins are listed.
...
Bug: 9074296
(cherry picked from commit d14258e50e
2013-06-06 14:08:34 -07:00
Dianne Hackborn
f750cdea06
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...
2013-06-06 12:54:34 -07:00
Dianne Hackborn
adc3a2825c
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...
2013-06-06 12:51:50 -07:00
Dianne Hackborn
9cd1d5e2c0
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...
2013-06-06 12:35:00 -07:00
Dianne Hackborn
a9a28d2fee
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...
2013-06-06 12:32:46 -07:00
Dianne Hackborn
f96a86c99d
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...
2013-06-06 12:30:51 -07:00
Dianne Hackborn
6d80d47739
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...
2013-06-06 12:29:04 -07:00
Dianne Hackborn
0bccd7e7f4
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...
2013-06-06 12:26:39 -07:00
Dianne Hackborn
5f28c77bc6
am d6086125: Fix issue #9074296 : Device Admins can activate in a way...
...
* commit 'd60861258169083f3174734af821fc8078ec5d2f':
Fix issue #9074296 : Device Admins can activate in a way...
2013-06-06 12:23:05 -07:00
Amith Yamasani
f71f25dbd6
am d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
...
* commit 'd63bd61ee862db18677276b1a18b2d7938a5e193':
Fix NullPointerException at RunningState
2013-06-06 11:19:06 -07:00
Amith Yamasani
d63bd61ee8
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
2013-06-06 18:16:31 +00:00
The Android Open Source Project
8548ddf229
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I6d5d0cb4778ad82dd1943e6facc621f87b37ac28
2013-06-06 10:37:41 -07:00
Johan Redestig
6fd5800386
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
2013-06-06 10:26:22 -07:00
Dianne Hackborn
d608612581
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 8274b67702
2013-06-05 15:48:20 -07:00
Baligh Uddin
f616ef4306
Import translations. DO NOT MERGE
...
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
2013-06-05 11:51:21 -07:00
The Android Automerger
8db2adb980
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-05 10:21:50 -07:00
Baligh Uddin
9c14c8d7aa
Import translations. DO NOT MERGE
...
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
2013-06-04 11:56:59 -07:00
Baligh Uddin
ac61782431
am 804b8b60: Import translations. DO NOT MERGE
...
* commit '804b8b60e7784ebbf660cf4348de24c1b2ae7146':
Import translations. DO NOT MERGE
2013-06-03 14:34:56 -07:00
The Android Open Source Project
b30d81d1dc
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0c4c9a3c4d05abbbde1198c2f4d0ee170a2ef7e5
2013-06-03 14:03:56 -07:00
Baligh Uddin
804b8b60e7
Import translations. DO NOT MERGE
...
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
2013-06-03 11:48:00 -07:00
The Android Automerger
a778aa2499
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-02 05:55:48 -07:00
Baligh Uddin
971d090a37
am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
Import translations. DO NOT MERGE
2013-06-01 08:23:29 -07:00
Baligh Uddin
eb0fff7a9a
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-31 22:43:38 +00:00
Jean-Baptiste Queru
8527d6d194
am 46cd7f64: Ignore 81476405 from AOSP
...
* commit '46cd7f64f00f530de4478137281c4d47d02c9244':
Settings: Fix Swedish translations
2013-05-30 15:39:39 -07:00
Jean-Baptiste Queru
46cd7f64f0
Ignore 81476405 from AOSP
2013-05-30 15:37:47 -07:00
Jean-Baptiste Queru
8147640558
Merge "Settings: Fix Swedish translations"
2013-05-30 22:06:37 +00:00
Robert Greenwalt
f96cfad36e
am 5ac90432: Don\'t show scan-always text if it is off.
...
* commit '5ac904321d81a0a0b7892c5722c464dc3c693f9f':
Don't show scan-always text if it is off.
2013-05-30 12:06:30 -07:00
Robert Greenwalt
5ac904321d
Don't show scan-always text if it is off.
...
bug:9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
2013-05-30 11:33:36 -07:00
Baligh Uddin
586376a036
Import translations. DO NOT MERGE
...
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
2013-05-29 19:29:10 -07:00
The Android Open Source Project
ed7bc2fa00
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab
2013-05-29 08:06:16 -07:00
The Android Automerger
0013525263
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-29 05:55:30 -07:00
Baligh Uddin
5fd8a31187
am 1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1182f6755f17753f5b551ea40c11c263801a90c1':
Import translations. DO NOT MERGE
2013-05-28 21:00:23 -07:00
Baligh Uddin
1182f6755f
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-29 03:56:37 +00:00
Russell Brenner
1f9e42cd40
am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
...
* commit 'c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
Improved logic for Skip warning message
2013-05-28 13:23:35 -07:00
Russell Brenner
c280acc327
Merge "Improved logic for Skip warning message" into jb-mr2-dev
2013-05-28 20:22:40 +00:00
The Android Open Source Project
52f3b7c391
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
2013-05-28 07:37:45 -07:00
Baligh Uddin
44338bae31
Import translations. DO NOT MERGE
...
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
2013-05-27 11:58:11 -07:00
The Android Automerger
f80c318799
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-26 05:55:43 -07:00
Russell Brenner
765f55f52a
Improved logic for Skip warning message
...
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.
Bug: 9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
2013-05-24 16:09:39 -07:00
Baligh Uddin
5c20af4c7c
am 6fa5e627: Import translations. DO NOT MERGE
...
* commit '6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
Import translations. DO NOT MERGE
2013-05-23 09:30:23 -07:00
The Android Open Source Project
2dafd362c7
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
2013-05-23 08:05:45 -07:00
The Android Automerger
e874242f22
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-23 05:55:31 -07:00
Baligh Uddin
6fa5e627b8
Import translations. DO NOT MERGE
...
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
2013-05-23 00:31:54 -07:00
Amith Yamasani
7366262995
am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
...
* commit '21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
Update strings for clarity about restricted profiles
2013-05-22 15:07:00 -07:00
Amith Yamasani
21f008e1f4
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
2013-05-22 22:04:59 +00:00
Alex Klyubin
1eb2064ff4
am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
...
* commit '7229e29f1749ae10bd92b59ec3d663698a5045e7':
Ensure all active Device Admins are listed.
2013-05-22 14:09:10 -07:00
