Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,454 Commits 3 Branches 0 Tags
c53ad4cd807e74897ba2d7b799cb8ff6824b34e8
Commit Graph

96454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
c53ad4cd80 am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
  Verify certificates
 2014-03-20 11:11:16 -07:00
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
 2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
 2014-03-20 10:54:38 -07:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
 2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
 2014-03-20 10:47:34 -07:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
 2014-03-20 10:27:58 -07:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev 
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
 2014-03-20 10:04:23 -07:00
Marco Nelissen
a3337bc7c3 Merge "Verify certificates" into jb-dev 2014-03-20 16:58:37 +00:00
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Victoria Lease
6b96ecca90 am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances
 2014-03-19 14:51:58 -07:00
Victoria Lease
32753f4f1c am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances
 2014-03-19 14:47:23 -07:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Adrian Roos
ed529a5a78 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:41:20 -07:00
Adrian Roos
500ec9ce4b am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:34:05 -07:00
Adrian Roos
25fb713390 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:28:17 -07:00
Adrian Roos
0b2f212204 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:24:35 -07:00
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:17:12 -07:00
Adrian Roos
ecba937b00 DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 91c9561cbe)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
 2014-03-18 18:33:14 +01:00
Victoria Lease
1c12f9e762 malloc some advances 
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e05)
 2014-03-18 16:22:20 +00:00
Marco Nelissen
c936d73adb Verify certificates 
b/13418320

Cherrypicked from 7e435a011d
https://googleplex-android-review.git.corp.google.com/#/c/433316/

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
 2014-03-17 11:14:18 -07:00
Craig Mautner
ad63d91439 am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '20a4f490957407b9534fc453833de2fe2f276426':
  Show the keyguard if unsecure window on top
 2014-03-13 11:01:13 -07:00
Craig Mautner
20a4f49095 am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '817f5586053ae135a59cd0768980ca741e9215b0':
  Show the keyguard if unsecure window on top
 2014-03-13 10:58:11 -07:00
Craig Mautner
817f558605 am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '3d958f81c54252b452631ea1bb6e7954fc7066c8':
  Show the keyguard if unsecure window on top
 2014-03-13 10:55:31 -07:00
Craig Mautner
3d958f81c5 am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
  Show the keyguard if unsecure window on top
 2014-03-13 10:51:39 -07:00
Craig Mautner
468e8e9873 am 1f52437d: Show the keyguard if unsecure window on top 
* commit '1f52437de9aa6089a72c7c992f9e7291a6a96115':
  Show the keyguard if unsecure window on top
 2014-03-13 10:47:49 -07:00
Craig Mautner
1f52437de9 Show the keyguard if unsecure window on top 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b8)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-12 22:52:26 +00:00
Paul Lawrence
2e582d1379 am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9 am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:40:21 -08:00
Paul Lawrence
08ee74b1f1 am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:38:01 -08:00
Paul Lawrence
ea5586ef7f am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:28:43 -08:00
Paul Lawrence
4be7c61a33 am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:24:05 -08:00
Paul Lawrence
5677513b7c am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:20:24 -08:00
Paul Lawrence
da37ed8b0a am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:16:49 -08:00
Paul Lawrence
b9ba0c6c43 Prevent authenticators from using Settings to launch arbitrary activities. 
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

This is a backport of 5bab9daf3c

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
 2014-02-27 09:09:48 -08:00
David Christie
4013c4b18c am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:43:47 -08:00
David Christie
42d7a0bff5 am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:41:48 -08:00
David Christie
a7d13fabd6 am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:40:04 -08:00
David Christie
45aaa377c5 am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:36:49 -08:00
David Christie
a1b89310d5 am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:33:39 -08:00
David Christie
a87bdc1f8f Merge commit 'bc39746e' into manualmerge 2014-01-10 13:17:01 -08:00
David Christie
ea47cb6763 am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:10:12 -08:00
David Christie
bf6cecc21f am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:05:35 -08:00
David Christie
5716e4bfb9 am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:02:48 -08:00
David Christie
776b3956a9 am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:00:09 -08:00
David Christie
7f4d82932c am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:55:24 -08:00
David Christie
bc39746ee9 am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:53:41 -08:00
David Christie
6826387e50 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
 2014-01-06 18:15:05 -08:00