Adrian Roos
90630f6a6d
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
2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065
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
2014-04-03 14:17:11 +00:00
Adrian Roos
c4bfea207a
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
2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad
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
2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157
am 8184ea52
: Add lockout after trying to enter PIN / Password too often
...
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:49:53 +00:00
Adrian Roos
8184ea5245
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
2014-04-02 16:28:10 +02:00
Amith Yamasani
0ad774458a
am 7c0ada65
: am 3f722079
: am 1ba09366
: am 0fce6123
: am 7a2d8bd4
: am 49d502a4
: am c7843db0
: Remove unused DebugIntentSender
...
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554
am 3f722079
: am 1ba09366
: am 0fce6123
: am 7a2d8bd4
: am 49d502a4
: am c7843db0
: Remove unused DebugIntentSender
...
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
2014-02-05 11:27:30 -08:00
Amith Yamasani
0fce6123bd
am 7a2d8bd4
: am 49d502a4
: am c7843db0
: Remove unused DebugIntentSender
...
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0
am 49d502a4
: am c7843db0
: Remove unused DebugIntentSender
...
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d
am c7843db0
: Remove unused DebugIntentSender
...
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4
)
2014-02-04 23:48:05 +00:00
Amith Yamasani
aad8d90ce0
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
2013-09-27 11:46:25 -07:00
Amith Yamasani
b4881f79e1
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
2013-09-27 11:27:47 -07:00
Amith Yamasani
53a56ad89c
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
2013-09-27 11:18:04 -07:00
Amith Yamasani
447415f4f1
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
2013-09-27 11:14:30 -07:00
Amith Yamasani
7870850387
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
2013-09-27 11:10:37 -07:00
Amith Yamasani
77aa51e5b7
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
2013-09-25 17:11:34 -07:00
Wink Saville
7bee4c2942
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
2013-08-29 19:58:09 -07:00
Wink Saville
bb77bf22d5
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
...
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-28 14:26:27 -07:00
Dianne Hackborn
a6683e0f4a
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-02 19:20:48 -07:00
Robert Greenwalt
4929e912c0
Use ConnectivityManager for mobile provision url
...
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-16 14:39:50 -07:00
Wink Saville
b464478664
VZW wants the phoneNumber to be 10 zero's if there isn't one.
...
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 22:19:26 -07:00
Wink Saville
5d5a269f59
Add Manage mobile plan to Settings.
...
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-07-01 16:27:10 -07:00
Dianne Hackborn
f5f08628cc
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
2013-06-19 17:01:51 -07:00
Amith Yamasani
1b79c5c804
Merge "Allow hidden apps to opt-out" into jb-mr2-dev
2013-06-07 17:45:26 +00:00
Alex Klyubin
681b21f3e4
resolved conflicts for merge of 5d21820a
to jb-mr2-dev
...
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
2013-06-06 15:45:23 -07:00
Alex Klyubin
5d21820a97
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.
2013-06-06 15:35:41 -07:00
Alex Klyubin
5aa3f87824
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.
2013-06-06 15:35:34 -07:00
Alex Klyubin
8d5aeffa7d
am 089d1615
: am 01dbfbf9
: am efd88e2c
: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
Permit deactivation of malformed Device Admins.
2013-06-06 15:29:56 -07:00
Alex Klyubin
9f6a193394
am 0ffbbad5
: am 60544e74
: am 3dddd8cb
: Ensure all active Device Admins are listed.
...
* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
2013-06-06 15:29:56 -07:00
Alex Klyubin
089d161588
am 01dbfbf9
: am efd88e2c
: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
Permit deactivation of malformed Device Admins.
2013-06-06 15:28:53 -07:00
Alex Klyubin
0ffbbad5b1
am 60544e74
: am 3dddd8cb
: Ensure all active Device Admins are listed.
...
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
2013-06-06 15:28:52 -07:00
Alex Klyubin
01dbfbf9c3
am efd88e2c
: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
Permit deactivation of malformed Device Admins.
2013-06-06 15:26:49 -07:00
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
)
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
2013-06-06 14:08:34 -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
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
d63bd61ee8
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
2013-06-06 18:16:31 +00: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
)
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
2013-06-05 15:48:20 -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
Russell Brenner
c280acc327
Merge "Improved logic for Skip warning message" into jb-mr2-dev
2013-05-28 20:22:40 +00: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
Amith Yamasani
21f008e1f4
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
2013-05-22 22:04:59 +00:00