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

115952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2970654a6a am 0109047d: update google play badge AI files, v2. 
* commit '0109047de1d68f7e911ae8d39f70330f5dbcd642':
  update google play badge AI files, v2.
 2014-03-04 03:08:18 +00:00
Scott Main
0109047de1 update google play badge AI files, v2. 
Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7
 2014-03-03 19:04:20 -08:00
Yorke Lee
81479358de Reword the "Quick contacts not available" string 
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)
 2014-03-04 02:50:21 +00:00
Scott Main
318c73a0df am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '4a5a23920e1a3414f1c87e3cf4c9bce08fddac4f':
  dashboard update for march '14
 2014-03-04 02:47:51 +00:00
Scott Main
4a5a23920e Merge "dashboard update for march '14" into klp-docs 2014-03-04 02:45:26 +00:00
David Friedman
0cdefe0969 NDK r9d: Incorporates all review comments, final file sizes. 
Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
 2014-03-03 18:31:13 -08:00
Christopher Tate
28c8cfd762 Adapt to underlying changes in the PBKDF2 implementation 
We need to specify "PBKDF2WithHmacSHA1And8bit" now in order to get precisely
the same output as was previously generated with "PBKDF2WithHmacSHA1".  We
also now try both when it's ambiguous which was used to generate the archive
checksums.

Bug 12494407

Cherry-pick from master.

Change-Id: I2d6081dd62f50f7d493045150b327ed120de7abd
 2014-03-03 17:49:30 -08:00
Christopher Tate
88c908323a Update PackageMonitor to recognize new 'replacing' semantics 
The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application.  Update PackageMonitor to recognize this
new information and express it appropriately to the observer.

Bug 11988313

Cherry-pick from master.

Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5
 2014-03-03 17:40:41 -08:00
Ricardo Cervera
7e4db882c5 am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '240b38aafb05407a147fceefed13df33c19aa2b2':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:10:51 +00:00
Ricardo Cervera
240b38aafb Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 2014-03-04 01:07:52 +00:00
Ricardo Cervera
ea40a2642b docs: Changes to release notes for the Android SDK 22.6.0 release. 
Updated relese notes for 22.6.0:

Stage:
http://quixote.mtv.corp.google.com:8001/sdk/index.html
http://quixote.mtv.corp.google.com:8001/sdk/installing/installing-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/eclipse-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/tools-notes.html
http://quixote.mtv.corp.google.com:8001/tools/revisions/build-tools.html

(Patch: Cleared md5 and ZIP entries. To be updated with values for
 the final build when available.)
(Patch: Added emulator bugfixes from Xav.)
(Patch: Addressed Joe's comments. Added filenames and checksums for the
 rc7 build)
(Patch: Replaced sizes and hashes with values for rc8)
(Patch: Added lint categories, addressed Joe's comments)
(Patch: Added note on the lint issue)
(Patch: Addressed Joe's comments, reverted adt-bundle-* to 20131030 files.)

Change-Id: I508d47959c4f478a3ed6b927fd460139cd5cfe36
 2014-03-03 16:41:10 -08:00
Dirk Dougherty
26de0b7118 am cce121fb: Merge "Update permission description string." into klp-docs 
* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.
 2014-03-03 22:13:31 +00:00
Dirk Dougherty
cce121fb75 Merge "Update permission description string." into klp-docs 2014-03-03 22:10:26 +00:00
Dirk Dougherty
08d7c2861f Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
 2014-03-03 14:05:21 -08:00
Scott Main
22a9fb31a4 dashboard update for march '14 
Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
 2014-03-03 14:00:59 -08:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00
Jonathan Dixon
7c01f9f7ab am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master 
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

Cherry pick to klp-dev as part of Bug: 13246014
 2014-03-03 18:48:00 +00:00
Bart Sears
4e1bf73202 Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 2014-03-03 18:42:28 +00:00
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
 2014-03-03 18:01:53 +00:00
rich cannings
bc4d34dd8e am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:21:58 +00:00
rich cannings
8ebfbffcbb Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 2014-03-03 17:19:02 +00:00
John Spurlock
5237a792aa am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 16:57:22 +00:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter. 
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
 2014-03-03 10:14:41 -05:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge 
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
 2014-03-01 18:07:22 +00:00
Paul Lawrence
0619edd3f3 am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '7ab82a0c602956251be9dd5539208af9cfecea33':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:24:42 +00:00
Carlos Valdivia
b675b474d1 am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9395f63aa5a386088ad93e3e226ef333084c5b74':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:24:39 +00:00
Paul Lawrence
7ab82a0c60 am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '657dbc40427c17cbf31be1a17cf2fa7a4116722a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:21:05 +00:00
Carlos Valdivia
9395f63aa5 am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '55cab009f0c9b1939f8336e26144850a5fdc9d3a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:21:01 +00:00
Paul Lawrence
657dbc4042 am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'b37768816cd9c530dcbb3a8f51d87536406a975b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 12:04:07 -08:00
Paul Lawrence
b37768816c am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '8b91693683895a8b148f6ffea8944cef2ba8d99b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 12:00:08 -08:00
Paul Lawrence
8b91693683 am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:55:10 -08: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
Carlos Valdivia
55cab009f0 am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9272db024d013fbb48ec476c77562ab31d75a461':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:22:53 -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
Carlos Valdivia
9272db024d am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:17:11 -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
Carlos Valdivia
c45bd7f209 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.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit 5bab9daf3cf66f4de19f8757e386030e8bef23ce)
 2014-02-27 17:03:15 +00:00
Michael Wright
bdffc3ad05 Revert Japanese special case fallback keys. 
Reverts commits 4567e40eb04589d211af82f2dcb16cb3955c605e and
a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
for game controllers in the Japanese locale.

Bug: 12923922
Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
 2014-02-26 15:43:48 -08:00
Scott Main
52d5190052 fix typos 
Change-Id: I28bcbf5ae5fade081d9b71701f5568145d700e9c
 2014-02-26 10:34:54 -08:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:12:35 -08:00