OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:26:05 +0000 (01:26 +0000)]
am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit '430652c1e18c54dc6ae9debedb6394f2f1905903':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...

10 years agoMerge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

10 years agoam 8cb232cb: Merge "ProgressBar is important for accessibility by default." into...
Svetoslav [Fri, 7 Mar 2014 00:39:05 +0000 (00:39 +0000)]
am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev

* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
  ProgressBar is important for accessibility by default.

10 years agoam e29c96e7: Merge "libexif is now libjhead" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:38:48 +0000 (00:38 +0000)]
am e29c96e7: Merge "libexif is now libjhead" into klp-dev

* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
  libexif is now libjhead

10 years agoMerge "ProgressBar is important for accessibility by default." into klp-dev
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev

10 years agoMerge "libexif is now libjhead" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:34:36 +0000 (00:34 +0000)]
Merge "libexif is now libjhead" into klp-dev

10 years agolibexif is now libjhead
Marco Nelissen [Thu, 19 Dec 2013 22:21:19 +0000 (14:21 -0800)]
libexif is now libjhead

b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212

10 years agoam a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
Jay Shrauner [Fri, 7 Mar 2014 00:00:14 +0000 (00:00 +0000)]
am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE

* commit 'a3ea4be5425fc2a561290c08a9f5f31f374afc31':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE

10 years agoPrevent SpellChecker from setting invalid range - DO NOT MERGE
Jay Shrauner [Fri, 7 Feb 2014 21:28:59 +0000 (13:28 -0800)]
Prevent SpellChecker from setting invalid range - DO NOT MERGE

Add check for invalid range before setting for further check
at end of parse() loop.

Bug:12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit ea4adf28474d949c51518a5abe6dbd3a3529cf29)

10 years agoam 92a32832: DO NOT MERGE - Fix Javadoc build break.
Leon Scroggins III [Thu, 6 Mar 2014 21:31:31 +0000 (21:31 +0000)]
am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.

10 years agoDO NOT MERGE - Fix Javadoc build break.
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
DO NOT MERGE - Fix Javadoc build break.

Remove links to non-specific function name.

Bug: 13246311

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)

10 years agoam ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Leon Scroggins III [Thu, 6 Mar 2014 19:49:58 +0000 (19:49 +0000)]
am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev

* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE

10 years agoam 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
Eric Laurent [Thu, 6 Mar 2014 19:49:55 +0000 (19:49 +0000)]
am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev

* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode

10 years agoam 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Thu, 6 Mar 2014 19:49:52 +0000 (19:49 +0000)]
am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

* commit '71ab245a0d7830791cb89ec9130313620a1ee029':
  Fix issue #11536426 DO NOT MERGE

10 years agoam 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Santos Cordon [Thu, 6 Mar 2014 19:49:46 +0000 (19:49 +0000)]
am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.

* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.

10 years agoMerge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Leon Scroggins III [Thu, 6 Mar 2014 19:37:28 +0000 (19:37 +0000)]
Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev

10 years agoProgressBar is important for accessibility by default.
Svetoslav [Mon, 13 Jan 2014 23:25:58 +0000 (15:25 -0800)]
ProgressBar is important for accessibility by default.

If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.

Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit 7face75f2c655a371a4dcdf6063886f92c637ce4)

10 years agoMerge "Fix RemoteController synchronization mode" into klp-dev
Eric Laurent [Thu, 6 Mar 2014 19:21:26 +0000 (19:21 +0000)]
Merge "Fix RemoteController synchronization mode" into klp-dev

10 years agoFix issue #13199860: PRE_BOOT_COMPLETED intent is...
Dianne Hackborn [Thu, 6 Mar 2014 18:52:05 +0000 (10:52 -0800)]
Fix issue #13199860: PRE_BOOT_COMPLETED intent is...

...broadcasted repeatedly at every boot time

Remember the last done pre-boot receivers, so that if we have
a new pre boot receiver appearing (without the platform version
changing), when we re-write the file of done receivers it will
contain all of them, not just the new one.

Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4

10 years agoMerge "Fix issue #11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Thu, 6 Mar 2014 18:29:19 +0000 (18:29 +0000)]
Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

10 years agoFix issue #11536426 DO NOT MERGE
Dianne Hackborn [Mon, 2 Dec 2013 18:04:42 +0000 (10:04 -0800)]
Fix issue #11536426 DO NOT MERGE

Permission denied when trying to launch an activity from a notification

We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working.  However, when uninstalling
an app, we should clear out all of its pending intents.

Change-Id: I95067b31098115b5a7b127766fd093750063bbb8

10 years agoam 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 6 Mar 2014 17:41:09 +0000 (17:41 +0000)]
am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '221849b6d68704340754200492329f19cef7979b':
  Import translations. DO NOT MERGE

10 years agoUpdating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Santos Cordon [Tue, 4 Mar 2014 00:06:54 +0000 (16:06 -0800)]
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.

bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)

10 years agoFix RemoteController synchronization mode
Jean-Michel Trivi [Thu, 2 Jan 2014 23:08:26 +0000 (15:08 -0800)]
Fix RemoteController synchronization mode

Fix erroneous argument check in RemoteController syncrhonization
  mode setter..

Bug 12189375

Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10

10 years agoUpdate framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE

(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
 const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
 const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
 const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 6 Mar 2014 17:00:46 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 77a60f00: Merge "Update permission description string." into klp-dev
Santos Cordon [Thu, 6 Mar 2014 01:56:50 +0000 (01:56 +0000)]
am 77a60f00: Merge "Update permission description string." into klp-dev

* commit '77a60f006f8b7260207043529d3ed004db301bd5':
  Update permission description string.

10 years agoMerge "Update permission description string." into klp-dev
Santos Cordon [Thu, 6 Mar 2014 01:54:20 +0000 (01:54 +0000)]
Merge "Update permission description string." into klp-dev

10 years agoam c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
Michael Wright [Thu, 6 Mar 2014 00:53:22 +0000 (00:53 +0000)]
am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev

* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.

10 years agoMerge "Revert Japanese special case fallback keys." into klp-dev
Michael Wright [Thu, 6 Mar 2014 00:50:15 +0000 (00:50 +0000)]
Merge "Revert Japanese special case fallback keys." into klp-dev

10 years agoam 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widge...
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:30 +0000 (00:32 +0000)]
am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev

* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE

10 years agoam 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmaticall...
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:27 +0000 (00:32 +0000)]
am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev

* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE

10 years agoMerge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarVie...
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:34 +0000 (00:29 +0000)]
Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev

10 years agoMerge "Fix bug #12422326 Unable to change text direction programmatically using setTe...
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:20 +0000 (00:29 +0000)]
Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev

10 years agoUpdate permission description string.
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.

Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)

10 years agoam 40a26004: Issue #13308712: Add --checkin to package manager dump.
Dianne Hackborn [Wed, 5 Mar 2014 23:07:45 +0000 (23:07 +0000)]
am 40a26004: Issue #13308712: Add --checkin to package manager dump.

* commit '40a26004810623f02546a31cb0ce49a0502bdff7':
  Issue #13308712: Add --checkin to package manager dump.

10 years agoIssue #13308712: Add --checkin to package manager dump.
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Issue #13308712: Add --checkin to package manager dump.

Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233

10 years agoFix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScr...
Fabrice Di Meglio [Tue, 10 Dec 2013 00:40:14 +0000 (16:40 -0800)]
Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE

- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)

Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783

10 years agoFix bug #12422326 Unable to change text direction programmatically using setTextDirec...
Fabrice Di Meglio [Tue, 7 Jan 2014 00:30:43 +0000 (16:30 -0800)]
Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE

- force TextView internal layout recreation when its TextDirection is changed

Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit 22228fec05129af9684f95d7a13aeff92144bd90)

10 years agoam 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
Robert Greenwalt [Wed, 5 Mar 2014 18:27:03 +0000 (18:27 +0000)]
am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev

* commit '2d1e8c49582fb91df0a05a778c228fc1cd89e026':
  Only apply tcp buffer sizes for default net

10 years agoMerge "Only apply tcp buffer sizes for default net" into klp-dev
Robert Greenwalt [Wed, 5 Mar 2014 18:23:56 +0000 (18:23 +0000)]
Merge "Only apply tcp buffer sizes for default net" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Mar 2014 17:58:27 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE

Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import

10 years agoam 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into...
Christopher Tate [Wed, 5 Mar 2014 00:54:17 +0000 (00:54 +0000)]
am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev

* commit '1d13f13deac644bddbae8a1f92642074a32d7a6c':
  Adapt to underlying changes in the PBKDF2 implementation

10 years agoam 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics...
Christopher Tate [Wed, 5 Mar 2014 00:54:14 +0000 (00:54 +0000)]
am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics

10 years agoMerge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:32 +0000 (00:51 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev

10 years agoMerge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev

10 years agoam fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:12:40 +0000 (19:12 +0000)]
am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev

* commit 'fee6f69e8321c3f94c2b341fe483f7b1f6534169':
  Volume panel should not clear system ui flags.

10 years agoam 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:12:37 +0000 (19:12 +0000)]
am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev

* commit '8ec59a72889f7da0c13119977ca62ada8a1498e0':
  Show hideycling for non-primary users.

10 years agoam d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into...
John Spurlock [Tue, 4 Mar 2014 19:12:33 +0000 (19:12 +0000)]
am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev

* commit 'd36ede391619e6fc8a1553f5b2f4b33b3603cd65':
  Allow lights-out + bar icon dimming on low-end devices.

10 years agoMerge "Volume panel should not clear system ui flags." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:09:20 +0000 (19:09 +0000)]
Merge "Volume panel should not clear system ui flags." into klp-dev

10 years agoMerge "Show hideycling for non-primary users." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:46 +0000 (19:08 +0000)]
Merge "Show hideycling for non-primary users." into klp-dev

10 years agoMerge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:31 +0000 (19:08 +0000)]
Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev

10 years agoam be659185: use min app launch time in AppLaunch perf test
Guang Zhu [Tue, 4 Mar 2014 18:38:32 +0000 (18:38 +0000)]
am be659185: use min app launch time in AppLaunch perf test

* commit 'be6591856bd62e14d7c87dd927db0cbbed242d81':
  use min app launch time in AppLaunch perf test

10 years agouse min app launch time in AppLaunch perf test
Guang Zhu [Thu, 20 Feb 2014 01:58:38 +0000 (17:58 -0800)]
use min app launch time in AppLaunch perf test

Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
(cherry picked from commit 2861a89bed9066e206917c41357a5e589e8482cb)

10 years agoOnly apply tcp buffer sizes for default net
Robert Greenwalt [Sat, 1 Mar 2014 00:44:00 +0000 (16:44 -0800)]
Only apply tcp buffer sizes for default net

This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226

10 years agoVolume panel should not clear system ui flags.
John Spurlock [Wed, 4 Dec 2013 18:47:36 +0000 (13:47 -0500)]
Volume panel should not clear system ui flags.

Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.

Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.

Reverts part of I25f29af5b6518aba695b64a75977ae240b742118

Bug:11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57

10 years agoShow hideycling for non-primary users.
John Spurlock [Mon, 9 Dec 2013 16:59:45 +0000 (11:59 -0500)]
Show hideycling for non-primary users.

User 0 owns the window (system_server) but should be allowed
to display on a user's behalf.

Use the corresponding private flag for this system window, since
we cannot classify it by type (TYPE_TOAST) in policy.

Bug:12015090
Change-Id: I33aedb4624288415a5e1ae937676b693024546a9

10 years agoAllow lights-out + bar icon dimming on low-end devices.
John Spurlock [Tue, 14 Jan 2014 19:51:23 +0000 (14:51 -0500)]
Allow lights-out + bar icon dimming on low-end devices.

Maintain fallback to OPAQUE mode on low-end devices in place of the
translucent modes.

Bug: 12546110
Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a

10 years agoam 9182e5f8: DO NOT MERGE
David Friedman [Tue, 4 Mar 2014 07:47:46 +0000 (07:47 +0000)]
am 9182e5f8: DO NOT MERGE

* commit '9182e5f848a2865a233ed143d56ad8dae599d875':
  DO NOT MERGE

10 years agoDO NOT MERGE
David Friedman [Wed, 19 Feb 2014 06:08:05 +0000 (22:08 -0800)]
DO NOT MERGE

Moving change to release branch

NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
(cherry picked from commit 0cdefe09695651e4a56dd980219710af8e1039a3)

10 years agoMerge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev
David Friedman [Tue, 4 Mar 2014 04:25:38 +0000 (04:25 +0000)]
Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

10 years agoam 81479358: Reword the "Quick contacts not available" string
Yorke Lee [Tue, 4 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am 81479358: Reword the "Quick contacts not available" string

* commit '81479358decb0a2cefbb8245e0f56ed0e966d697':
  Reword the "Quick contacts not available" string

10 years agoam 0109047d: update google play badge AI files, v2.
Scott Main [Tue, 4 Mar 2014 03:08:18 +0000 (03:08 +0000)]
am 0109047d: update google play badge AI files, v2.

* commit '0109047de1d68f7e911ae8d39f70330f5dbcd642':
  update google play badge AI files, v2.

10 years agoupdate google play badge AI files, v2.
Scott Main [Wed, 26 Feb 2014 19:54:44 +0000 (11:54 -0800)]
update google play badge AI files, v2.

Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7

10 years agoReword the "Quick contacts not available" string
Yorke Lee [Tue, 10 Dec 2013 17:51:40 +0000 (09:51 -0800)]
Reword the "Quick contacts not available" string

Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)

10 years agoam 4a5a2392: Merge "dashboard update for march \'14" into klp-docs
Scott Main [Tue, 4 Mar 2014 02:47:51 +0000 (02:47 +0000)]
am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit '4a5a23920e1a3414f1c87e3cf4c9bce08fddac4f':
  dashboard update for march '14

10 years agoMerge "dashboard update for march '14" into klp-docs
Scott Main [Tue, 4 Mar 2014 02:45:25 +0000 (02:45 +0000)]
Merge "dashboard update for march '14" into klp-docs

10 years agoNDK r9d: Incorporates all review comments, final file sizes.
David Friedman [Wed, 19 Feb 2014 06:08:05 +0000 (22:08 -0800)]
NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750

10 years agoAdapt to underlying changes in the PBKDF2 implementation
Christopher Tate [Mon, 13 Jan 2014 21:48:22 +0000 (13:48 -0800)]
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

10 years agoUpdate PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Thu, 9 Jan 2014 00:54:25 +0000 (16:54 -0800)]
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

10 years agoam 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release...
Ricardo Cervera [Tue, 4 Mar 2014 01:10:51 +0000 (01:10 +0000)]
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.

10 years agoMerge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp...
Ricardo Cervera [Tue, 4 Mar 2014 01:07:52 +0000 (01:07 +0000)]
Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

10 years agodocs: Changes to release notes for the Android SDK 22.6.0 release.
Ricardo Cervera [Tue, 25 Feb 2014 20:01:27 +0000 (12:01 -0800)]
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

10 years agoam cce121fb: Merge "Update permission description string." into klp-docs
Dirk Dougherty [Mon, 3 Mar 2014 22:13:31 +0000 (22:13 +0000)]
am cce121fb: Merge "Update permission description string." into klp-docs

* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.

10 years agoMerge "Update permission description string." into klp-docs
Dirk Dougherty [Mon, 3 Mar 2014 22:10:26 +0000 (22:10 +0000)]
Merge "Update permission description string." into klp-docs

10 years agoUpdate permission description string.
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.

Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978

10 years agodashboard update for march '14
Scott Main [Mon, 3 Mar 2014 20:17:17 +0000 (12:17 -0800)]
dashboard update for march '14

Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c

10 years agoam 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into...
Jay Shrauner [Mon, 3 Mar 2014 21:58:47 +0000 (21:58 +0000)]
am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge

10 years agoMerge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
Jay Shrauner [Mon, 3 Mar 2014 21:56:17 +0000 (21:56 +0000)]
Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

10 years agoam efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
Jonathan Dixon [Mon, 3 Mar 2014 18:54:35 +0000 (18:54 +0000)]
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

10 years agoam 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView...
Bart Sears [Mon, 3 Mar 2014 18:50:25 +0000 (18:50 +0000)]
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.

10 years agoDO NOT MERGE: Fix build after checkThread fix merge to master
Jonathan Dixon [Thu, 10 Oct 2013 00:28:13 +0000 (17:28 -0700)]
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

10 years agoMerge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
Bart Sears [Mon, 3 Mar 2014 18:42:27 +0000 (18:42 +0000)]
Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

10 years agoDO NOT MERGE: Adding freeMemoryForTests static method to WebView.
Primiano Tucci [Thu, 5 Sep 2013 11:01:51 +0000 (12:01 +0100)]
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

10 years agoam 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
rich cannings [Mon, 3 Mar 2014 17:21:58 +0000 (17:21 +0000)]
am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev

* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"

10 years agoMerge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
rich cannings [Mon, 3 Mar 2014 17:19:00 +0000 (17:19 +0000)]
Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev

10 years agoam 8c44c394: Doc fixups to ContentResolver, MediaRouter.
John Spurlock [Mon, 3 Mar 2014 16:57:22 +0000 (16:57 +0000)]
am 8c44c394: Doc fixups to ContentResolver, MediaRouter.

* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.

10 years agoDoc fixups to ContentResolver, MediaRouter.
John Spurlock [Mon, 3 Mar 2014 15:14:41 +0000 (10:14 -0500)]
Doc fixups to ContentResolver, MediaRouter.

Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8

10 years agoCatch ActivityNotFoundException in quick contacts badge
Yorke Lee [Sat, 7 Dec 2013 00:35:29 +0000 (16:35 -0800)]
Catch ActivityNotFoundException in quick contacts badge

Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)

10 years agoam 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am...
Paul Lawrence [Thu, 27 Feb 2014 22:24:42 +0000 (22:24 +0000)]
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.

10 years agoam 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators...
Carlos Valdivia [Thu, 27 Feb 2014 22:24:39 +0000 (22:24 +0000)]
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.

10 years agoam 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am...
Paul Lawrence [Thu, 27 Feb 2014 22:21:05 +0000 (22:21 +0000)]
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.

10 years agoam 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using...
Carlos Valdivia [Thu, 27 Feb 2014 22:21:01 +0000 (22:21 +0000)]
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.

10 years agoam b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am...
Paul Lawrence [Thu, 27 Feb 2014 20:04:07 +0000 (12:04 -0800)]
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.

10 years agoam 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am...
Paul Lawrence [Thu, 27 Feb 2014 20:00:08 +0000 (12:00 -0800)]
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.

10 years agoam 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am...
Paul Lawrence [Thu, 27 Feb 2014 19:55:10 +0000 (11:55 -0800)]
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.

10 years agoam 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am...
Paul Lawrence [Thu, 27 Feb 2014 19:44:37 +0000 (11:44 -0800)]
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.

10 years agoam 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent...
Paul Lawrence [Thu, 27 Feb 2014 19:40:21 +0000 (11:40 -0800)]
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.

10 years agoam ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticato...
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
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.

10 years agoam 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using...
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
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.