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

88383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Christopher Tate
d3a57029e8 am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:59:40 -07:00
Christopher Tate
1b0c9c95dc am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:53:10 -07:00
Christopher Tate
81c1d8d3a5 Ensure install-during-restore is like install-then-restore 
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
 2013-05-06 14:43:05 -07:00
Nick Kralevich
d440ca7602 am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:41:36 -07:00
Nick Kralevich
f3a5323cc6 am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '6d8f5b755b133b308204b84145d773d401cdcd52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:38:40 -07:00
Nick Kralevich
6d8f5b755b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
 2013-04-29 15:31:03 -07:00
Dirk Dougherty
2974366173 Doc change: fix typo in tablet guidelines. 
Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41
 2013-04-24 19:33:46 -07:00
Dirk Dougherty
dacaad4ab2 Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 2013-04-24 19:08:42 +00:00
Dirk Dougherty
71f8127165 Doc change: Add tablet optimization tips info/link. 
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
 2013-04-24 11:49:27 -07:00
Selim Gurun
006119bf2c Merge commit '8237dd82' into manualmerge 
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
 2013-04-23 11:19:12 -07:00
Dirk Dougherty
00cfba95ce Doc change: update support urls. 
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
 2013-04-22 16:37:01 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account. 
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
 2013-04-22 14:17:36 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist. 
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
 2013-04-20 11:34:51 -07:00
Selim Gurun
758dfa0c33 am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:19:45 -07:00
Selim Gurun
3c4fa65480 am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:19:41 -07:00
Geremy Condra
b7787a317f DO NOT MERGE Merge commit '8225df00' into bp 
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
 2013-04-18 11:40:09 -07:00
Dirk Dougherty
c6af49efc4 Doc change: Add tablet basic checks. 
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
 2013-04-15 20:55:25 -07:00
Dirk Dougherty
99a79e807b Doc change: add policy guidelines documents. 
Change-Id: Iade088d20bc483fb65aabd85cb049b21188edf64
 2013-04-12 14:55:11 -07:00
Selim Gurun
8237dd82bf am 93c39d5d: DO NOT MERGE Fix issues during backport 
* commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af':
  DO NOT MERGE Fix issues during backport
 2013-04-05 12:05:52 -07:00
Selim Gurun
93c39d5d4f DO NOT MERGE Fix issues during backport 
Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
 2013-04-04 16:31:01 -07:00
Selim Gurun
9d47e7b6d4 am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-04 11:08:35 -07:00
Selim Gurun
679c8f689f am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '38915fd4d466cc233189bf5b5c11d7f03a416d35':
  Revert "Add a delimiter between scheme and host"
 2013-04-04 11:00:46 -07:00
Selim Gurun
7918cf4e6b DO NOT MERGE Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f
 2013-04-04 11:00:25 -07:00
Selim Gurun
38915fd4d4 Revert "Add a delimiter between scheme and host" 
This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
 2013-04-04 17:14:29 +00:00
Selim Gurun
8225df007e am aa2163dd: Add a delimiter between scheme and host 
* commit 'aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
  Add a delimiter between scheme and host
 2013-04-03 21:05:40 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
Selim Gurun
aa2163dd2a Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
 2013-04-01 16:04:23 -07:00
Joe Malin
98827948f1 Merge "Android Training: Accessing Contacts" into jb-mr1-dev 2013-03-26 16:31:22 +00:00
Christopher Tate
9432f83cea am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
  Validate restored file paths against their nominal domain
 2013-03-25 14:08:37 -07:00
Christopher Tate
7b3ac9add8 am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
  Validate restored file paths against their nominal domain
 2013-03-25 14:05:47 -07:00
Christopher Tate
0cb27e2807 Validate restored file paths against their nominal domain 
Bug 8460775

(cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
 2013-03-25 13:44:34 -07:00
Joe Malin
421435d2be Android Training: Accessing Contacts 
Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6
 2013-03-25 10:10:35 -07:00
Trevor Johns
58a54cb380 [docs] Fix issue #8288695: Typo in OAuth2 training 
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
 2013-03-06 14:46:47 -08:00
Scott Main
23513a2c85 docs: update country filtering description 
bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78
 2013-03-05 12:19:10 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86 cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f 
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
 2013-03-05 11:35:49 -08:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
 2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes. 
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
 2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes. 
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
 2013-03-01 16:17:09 -08:00