PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,925 Commits 1 Branch 0 Tags
451d8225ef3ae407f52512a93bcf04e6400eb997
Commit Graph

8925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jean-Baptiste Queru
33adccd203 am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':
 2013-03-11 13:00:49 -07:00
Jean-Baptiste Queru
9cff5e3f4a am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':
 2013-03-11 12:42:01 -07:00
Jean-Baptiste Queru
f4b1aefbaa am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '8638eeb4e925009fcc91fd9a9965740c25fe518a':
 2013-03-11 12:27:42 -07:00
Jean-Baptiste Queru
8638eeb4e9 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:22:07 -07:00
Jean Chalard
d0a9d5b6e0 am a374d816: Distinguish adding an already present word / cancelling 
* commit 'a374d81605f4ba760db9613dd8aa8d8a0370dab8':
  Distinguish adding an already present word / cancelling
 2012-12-17 10:44:36 -08:00
Jean Chalard
a374d81605 Distinguish adding an already present word / cancelling 
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
 2012-12-17 15:52:07 +09:00
Mike Cleron
49ce96a14b am 1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev 
* commit '1f597c8764b375bf87d411d11a29b2808e1d2ef9':
  Call back to whom requested to add a word to the user dict
 2012-12-14 10:59:17 -08:00
Mike Cleron
1f597c8764 Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev 2012-12-14 10:57:18 -08:00
Jean Chalard
e3f1171309 Call back to whom requested to add a word to the user dict 
Bug: 7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
 2012-12-14 18:08:05 +09:00
Irfan Sheriff
878072a11a am 2a9cbb61: am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev 
* commit '2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
  Fix wifi compareTo
 2012-12-13 11:32:51 -08:00
Irfan Sheriff
2a9cbb61b3 am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev 
* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo
 2012-12-13 11:30:41 -08:00
Irfan Sheriff
f197105e3b Merge "Fix wifi compareTo" into jb-mr1-dev 2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6 Fix wifi compareTo 
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
 2012-12-13 11:00:24 -08:00
Baligh Uddin
efacd47f4f am 5b4509b5: Import translations. DO NOT MERGE 
* commit '5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
  Import translations. DO NOT MERGE
 2012-12-12 13:40:49 -08:00
Baligh Uddin
5b4509b5ad Import translations. DO NOT MERGE 
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
 2012-12-12 13:19:14 -08:00
Baligh Uddin
92ff5ebe1e Import translations. DO NOT MERGE 
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
 2012-12-12 13:17:55 -08:00
Baligh Uddin
777688c963 am 67e9e59b: Import translations. DO NOT MERGE 
* commit '67e9e59bc943481b091998ba114ca6750f46b383':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:41 -08:00
Baligh Uddin
67e9e59bc9 Import translations. DO NOT MERGE 
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
 2012-12-10 10:57:09 -08:00
Baligh Uddin
3b10f0ba05 Import translations. DO NOT MERGE 
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
 2012-12-10 10:55:55 -08:00
Baligh Uddin
957f7fc94e am 3674d869: Import translations. DO NOT MERGE 
* commit '3674d8695166be6c0b7cc225f227f9e1604056e8':
  Import translations. DO NOT MERGE
 2012-12-07 11:44:18 -08:00
Baligh Uddin
3674d86951 Import translations. DO NOT MERGE 
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
 2012-12-07 11:35:18 -08:00
Baligh Uddin
29ce5561d8 Import translations. DO NOT MERGE 
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
 2012-12-07 11:34:10 -08:00
Amith Yamasani
b7d94e74e1 am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'aeb57edaef1abdcdcd21eb443047386940ffb755':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:43:37 -08:00
Amith Yamasani
aeb57edaef Pass the locale code in the help url for help pages. 
Otherwise the help will always be shown in English.

Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
 2012-12-06 14:40:51 -08:00
Jake Hamby
b39ab37aa0 am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'bc5d9271a9d36ecf07ac35e1635f36679074de6f':
  Add latest area info broadcast to Settings status screen.
 2012-12-04 20:08:21 -08:00