OSDN Git Service
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug:
14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug:
17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit
f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often
Enforce the same lockout that is already enforced when entering the pattern.
Bug:
13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit
26430486e4082c89e31a9489e4309566bda2fec8)
Amith Yamasani [Fri, 27 Sep 2013 18:46:25 +0000 (11:46 -0700)]
am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
b4881f79e1c065b40f234710b6fb28acce9e164f':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:27:47 +0000 (11:27 -0700)]
am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
451d8225ef3ae407f52512a93bcf04e6400eb997':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:24:28 +0000 (11:24 -0700)]
am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
49187c9418dc2c5f404385596db3d82dd896c178':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
53a56ad89cbd14410dcd8e5755c6765f1a438928':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:18:04 +0000 (11:18 -0700)]
am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
447415f4f17dc91d3844394625f4e6fa10efedad':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:14:30 +0000 (11:14 -0700)]
am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
7870850387dabd32a54e3fca7d65dea5f45a9a16':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:10:37 +0000 (11:10 -0700)]
am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
77aa51e5b7261638590af1d69ac03f4c8cd25692':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Wed, 25 Sep 2013 21:05:33 +0000 (14:05 -0700)]
Make sure that external callers cannot pass in the confirm bypass extra
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.
Also, make sure that the fragments are launched with the correct corresponding
activity.
Bug:
9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Baligh Uddin [Mon, 26 Aug 2013 20:54:28 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddf40541878ef237a1890dad5c3d16e4132d6dde
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Aug 2013 23:03:04 +0000 (16:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
Baligh Uddin [Mon, 19 Aug 2013 19:03:06 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Aug 2013 21:42:52 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:47:40 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dave Burke [Fri, 2 Aug 2013 20:36:33 +0000 (20:36 +0000)]
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."
This reverts commit
1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Sascha Prueter [Thu, 1 Aug 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Completely remove app ops activity." into jb-mr2-dev
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Jul 2013 18:08:10 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 21:30:01 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
Robert Greenwalt [Wed, 17 Jul 2013 23:47:01 +0000 (23:47 +0000)]
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Baligh Uddin [Mon, 15 Jul 2013 18:36:58 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
Wink Saville [Fri, 12 Jul 2013 18:58:56 +0000 (18:58 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Wink Saville [Thu, 11 Jul 2013 05:19:26 +0000 (22:19 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Baligh Uddin [Thu, 11 Jul 2013 03:28:57 +0000 (20:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Jul 2013 16:17:21 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Jul 2013 20:54:27 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
Baligh Uddin [Tue, 2 Jul 2013 16:34:18 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Wink Saville [Sat, 29 Jun 2013 14:54:13 +0000 (07:54 -0700)]
Add Manage mobile plan to Settings.
Bug:
9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Baligh Uddin [Mon, 1 Jul 2013 16:19:04 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
Amith Yamasani [Thu, 27 Jun 2013 16:41:15 +0000 (09:41 -0700)]
Fix inconsistent string
Bug:
9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
Dianne Hackborn [Thu, 20 Jun 2013 21:38:29 +0000 (21:38 +0000)]
Merge "Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev
Dianne Hackborn [Thu, 20 Jun 2013 00:01:51 +0000 (17:01 -0700)]
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.
Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
Baligh Uddin [Wed, 19 Jun 2013 19:40:06 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:14:19 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
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
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:19:40 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
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 [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: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: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:16:31 +0000 (18:16 +0000)]
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
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
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 [Fri, 31 May 2013 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
OSDN Git Service
