drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,324 Commits 1 Branch 0 Tags
Commit Graph

89324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 91c9561cbe665f91e1665f30362c409ae180b127)

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 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
 2014-03-18 16:22:20 +00:00
Marco Nelissen
c936d73adb Verify certificates 
b/13418320

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

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
 2014-03-17 11:14:18 -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 ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-12 22:52:26 +00: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 5bab9daf3cf66f4de19f8757e386030e8bef23ce

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
 2014-02-27 09:09:48 -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
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
David Christie
8e0c7768c8 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
 2014-01-06 17:57:30 -08:00
Christopher Tate
ef4694cbdd am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'ae229d991711745bdf8da2e716c31efde534e6da':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:34:13 -08:00
Christopher Tate
ae229d9917 am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '43253333d24e856a7ffef818fdfaedf3fd60d3b6':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:31:09 -08:00
Christopher Tate
43253333d2 am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:27:10 -08:00
Christopher Tate
50cbfd554f System package permission decls take precedence over 3rd party apps' 
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.

Bug 11242510

(Cherry-pick backport to JB)

Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed
 2013-11-07 19:04:22 -08:00
Amith Yamasani
9bf1a13948 am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:17:57 -07:00
Amith Yamasani
72c5e37687 am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:14:23 -07:00
Amith Yamasani
ba1ae3af76 am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '427864188dfc5dd803b15797379b9dc6673abd16':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:10:36 -07:00
Amith Yamasani
427864188d Don't instantiate non-Fragments in Fragment.instantiate 
Backport...

Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
 2013-09-27 10:28:09 -07:00
Kenny Root
1c5e33d37d am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
  Use hostname verifier directly instead of instance
 2013-08-13 17:36:42 -07:00
Kenny Root
3bc3240ffb am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
  Use hostname verifier directly instead of instance
 2013-08-13 17:31:32 -07:00
Kenny Root
a6226a2d20 am 32c99004: Use hostname verifier directly instead of instance 
* commit '32c990044f027542a034a7606cf010dca6df252f':
  Use hostname verifier directly instead of instance
 2013-08-13 17:27:49 -07:00
Kenny Root
32c990044f Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
 2013-08-13 14:13:08 -07:00
Dirk Dougherty
bc5f9b6674 Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 2013-07-12 00:50:59 +00:00
Dirk Dougherty
8f1a759727 Doc change: Update gcore reference docs. 
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
 2013-07-10 18:38:36 -07:00
Joe Malin
a62413772e Doc Bug: b9739899 Bugs in Sync Adapters training 
Change-Id: Ia6f0fc79c73dd66a1d8306e49ff51fc29fb62c7f
 2013-07-08 15:37:34 -07:00
Joe Malin
c355a1c156 DOC: Sync Adapters Android Training 
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
(cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)
 2013-06-30 16:16:18 +00:00
Dirk Dougherty
8451fc4f86 Doc change: edits to education opt-in docs. 
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
 2013-06-24 00:58:04 -07:00
Dirk Dougherty
f812258e5c Doc change: add docs for edu opt-in. 
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
 2013-06-23 19:33:00 -07:00
kmccormick
9c309d3db9 Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322 
Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f
 2013-06-20 17:16:47 -07:00
Dirk Dougherty
6cb24e40ce Doc change: add video for edu page. 
Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df
 2013-06-20 13:53:45 -07:00
kmccormick
bf37018548 Doc update: restoring deprecation messages 
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
 2013-06-12 19:15:58 -07:00
Dirk Dougherty
fe3da794f7 Doc change: refresh gcore/gms reference from e-release. 
Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4
 2013-06-12 18:06:08 -07:00
Dirk Dougherty
57bb89f0b2 Doc change: Add docs for GP Purchase Status API. 
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
 2013-06-12 16:06:36 -07:00
Dirk Dougherty
16fdbd1729 Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 2013-06-06 17:36:29 +00:00
Dirk Dougherty
f4483eca3a Doc change: fix broken link to localization checklist. 
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
 2013-06-06 10:34:40 -07:00
kmccormick
db3158ead3 Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 2013-06-06 01:22:55 +00:00
kmccormick
f788ac1ab1 Doc update: Refactoring to client/server. 
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
 2013-06-05 18:01:06 -07:00
Joe Malin
10d96950c1 DOC CHANGE: Clarify textIsSelectable in TextView 
Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b
 2013-06-04 09:34:54 -07:00
Dirk Dougherty
8e307adcf6 Merge "Doc change: Add new developer video." into jb-mr1.1-docs 2013-06-04 02:08:21 +00:00
Dirk Dougherty
35592bd6be Doc change: Add new developer video. 
Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7
 2013-06-03 19:05:16 -07:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -07:00
Dirk Dougherty
4fad5c176a Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-31 21:08:45 +00:00