Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,382 Commits 1 Branch 0 Tags
09235d1065b501aa8a42e0767d72c15e7b846bae
Commit Graph

9382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
82b3e62a4f 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
 2014-04-03 14:11:02 +00:00
Adrian Roos
4692a48c28 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
 2014-04-03 14:05:07 +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
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
3f72207985 am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
  Remove unused DebugIntentSender
 2014-02-05 11:22:46 -08:00
Amith Yamasani
1ba09366cc am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
  Remove unused DebugIntentSender
 2014-02-05 11:19:03 -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
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
451d8225ef 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
 2013-09-27 11:24:28 -07:00
Amith Yamasani
49187c9418 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
 2013-09-27 11:20:20 -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
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
a65fa934f1 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.
 2013-06-06 15:33:46 -07:00
Alex Klyubin
0c32da7ee0 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.
 2013-06-06 15:33:45 -07:00
Alex Klyubin
8bfb859e3b 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.
 2013-06-06 15:32:00 -07:00
Alex Klyubin
6f28e3420a am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '9f6a193394de16bfe398c8b7424f273231c77134':
  Ensure all active Device Admins are listed.
 2013-06-06 15:32:00 -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
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
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
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
Kenny Root
0d52fc184d am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit '9dc478ec23944e9b008ab559e2f1360a9e4818b4':
  Add ability to install credentials as other UID
 2013-03-28 14:30:37 -07:00
Kenny Root
9dc478ec23 Merge "Add ability to install credentials as other UID" 2013-03-28 20:57:04 +00:00
Kenny Root
7422474c72 Add ability to install credentials as other UID 
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
 2013-03-28 11:35:24 -07:00
Jeff Sharkey
f8db32d8af am 74fd506b: Merge "Enable Ethernet tab in data usage" 
* commit '74fd506bba9643221479ba11ae56a6657ed48279':
  Enable Ethernet tab in data usage
 2013-03-20 10:21:53 -07:00
Jeff Sharkey
74fd506bba Merge "Enable Ethernet tab in data usage" 2013-03-20 17:08:25 +00:00
Jaewan Kim
ffce9c1e9a Enable Ethernet tab in data usage 
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
 2013-03-20 11:22:30 +09:00
Robert Greenwalt
cd1c38cf23 am ae9ebfd1: Merge "add MVNO field for APN Editor" 
* commit 'ae9ebfd153d63beb03c018786cb3a7ca7610ce64':
  add MVNO field for APN Editor
 2013-03-17 09:26:13 -07:00