OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 20555296: docs: squashed commit of i.o launches
Robert Ly [Sat, 14 Jun 2014 09:03:51 +0000 (09:03 +0000)]
am 20555296: docs: squashed commit of i.o launches

* commit '2055529600cda58bfcf9076b7c68467bbd5df7f8':
  docs: squashed commit of i.o launches

10 years agodocs: squashed commit of i.o launches
Robert Ly [Sat, 14 Jun 2014 06:28:19 +0000 (23:28 -0700)]
docs: squashed commit of i.o launches

Change-Id: I71bb6efb27f363dc6b47bf1e283369ae274caee8

10 years agoam 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows...
Vinod Krishnan [Sat, 14 Jun 2014 01:06:50 +0000 (01:06 +0000)]
am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev

* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows

10 years agoam aa1ecf5c: html cleanup. delete quickviews
smain@google.com [Sat, 14 Jun 2014 00:55:40 +0000 (00:55 +0000)]
am aa1ecf5c: html cleanup. delete quickviews

* commit 'aa1ecf5cdf70c5b76bd5e31d252735ba52a90b72':
  html cleanup. delete quickviews

10 years agohtml cleanup. delete quickviews
smain@google.com [Sat, 14 Jun 2014 00:47:15 +0000 (17:47 -0700)]
html cleanup. delete quickviews

Change-Id: Ifd71ca32848982919f37f8927acd8b66b0cf4438

10 years agoam b43eff80: adjust scroll position now that there\'s secondary nav bar
smain@google.com [Sat, 14 Jun 2014 00:35:48 +0000 (00:35 +0000)]
am b43eff80: adjust scroll position now that there\'s secondary nav bar

* commit 'b43eff80e56c29b29ac3f77ee12150211539dcee':
  adjust scroll position now that there's secondary nav bar

10 years agoadjust scroll position now that there's secondary nav bar
smain@google.com [Fri, 13 Jun 2014 22:05:29 +0000 (15:05 -0700)]
adjust scroll position now that there's secondary nav bar

Change-Id: I7aa237390066805bef210f2ed2f4ae1063e5e252

10 years agoam 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
Craig Mautner [Sat, 14 Jun 2014 00:30:47 +0000 (00:30 +0000)]
am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

10 years agoam 6fe2184b: Do not treat the dummy animation as an animation
Craig Mautner [Sat, 14 Jun 2014 00:22:36 +0000 (00:22 +0000)]
am 6fe2184b: Do not treat the dummy animation as an animation

* commit '6fe2184bf10362ac53db7e8f6a0be521ea59b054':
  Do not treat the dummy animation as an animation

10 years agoRevert "Revert "Close ActivityView and ActivityContainer cleanly.""
Craig Mautner [Sat, 14 Jun 2014 00:18:47 +0000 (17:18 -0700)]
Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.

10 years agoDo not treat the dummy animation as an animation
Craig Mautner [Fri, 13 Jun 2014 22:08:48 +0000 (15:08 -0700)]
Do not treat the dummy animation as an animation

The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.

Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.

Fixes bug 15591610.

Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491

10 years agoam 78219f04: update download pages for SDK and remove /tools landing page.
smain@google.com [Fri, 13 Jun 2014 22:40:49 +0000 (22:40 +0000)]
am 78219f04: update download pages for SDK and remove /tools landing page.

* commit '78219f0466a1924e8edb1a0b7a40b7d51d7f6283':
  update download pages for SDK and remove /tools landing page.

10 years agoMerge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp...
Vinod Krishnan [Sat, 14 Jun 2014 01:03:28 +0000 (01:03 +0000)]
Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev

10 years agoDO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
Adam Powell [Wed, 11 Jun 2014 22:33:08 +0000 (15:33 -0700)]
DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows

----
Explicitly track consumed state for WindowInsets

Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.
----
Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout

Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.
---
Fix CTS regression in fitSystemWindows

Don't attempt to apply null insets from a call to fitSystemWindows.
Immediately return false since null insets cannot be applied.
----

Bug: 15452706
Change-Id: I34276a90305b141b4653aef0048f70350c69d02a

10 years agoupdate download pages for SDK and remove /tools landing page.
smain@google.com [Fri, 13 Jun 2014 18:39:35 +0000 (11:39 -0700)]
update download pages for SDK and remove /tools landing page.

Change-Id: I7e883a2647d7c487570c4abdba9df5d72a52b274

10 years agoam 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Fri, 13 Jun 2014 18:29:36 +0000 (18:29 +0000)]
am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.

* commit '81be9239fd9bf4122757a23e143c0aa1b925b42b':
  docs: Added "Verifying for ART" to TOC.

10 years agoam bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Fri, 13 Jun 2014 18:25:53 +0000 (18:25 +0000)]
am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.

* commit 'bd8ca9f9adf10a5b7e1e04ed139e4108758e286f':
  docs: Added "Verifying for ART" to TOC.

10 years agoam 4737af8b: docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Fri, 13 Jun 2014 18:23:03 +0000 (18:23 +0000)]
am 4737af8b: docs: Added "Verifying for ART" to TOC.

* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.

10 years agodocs: Added "Verifying for ART" to TOC.
Andrew Solovay [Thu, 12 Jun 2014 17:40:23 +0000 (10:40 -0700)]
docs: Added "Verifying for ART" to TOC.

Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.

You can verify it at

http://asolovay.mtv:9001/guide/practices/index.html

(...it's the last element in the "Best Practices" submenu.)

Change-Id: If7b445616768d17193309dbd3075b2630652ac96

10 years agoam dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
Justin Koh [Fri, 13 Jun 2014 17:27:48 +0000 (17:27 +0000)]
am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."

* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."

10 years agoRevert "Close ActivityView and ActivityContainer cleanly."
Justin Koh [Fri, 13 Jun 2014 16:55:09 +0000 (09:55 -0700)]
Revert "Close ActivityView and ActivityContainer cleanly."

This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2

10 years agoam 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep."...
Jeff Brown [Fri, 13 Jun 2014 03:08:35 +0000 (03:08 +0000)]
am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev

* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
  Suppress haptic feedback for SLEEP key when already asleep.

10 years agoam 926e1f01: Merge "When watch is docked, home key press should launch dock home...
Jeff Brown [Fri, 13 Jun 2014 03:04:25 +0000 (03:04 +0000)]
am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev

* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
  When watch is docked, home key press should launch dock home.

10 years agoam be634951: Fix permission problem and NPE
Craig Mautner [Thu, 12 Jun 2014 23:36:54 +0000 (23:36 +0000)]
am be634951: Fix permission problem and NPE

* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
  Fix permission problem and NPE

10 years agoam b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64...
Tim Murray [Thu, 12 Jun 2014 23:08:39 +0000 (23:08 +0000)]
am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."

* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
  Move FieldPacker over to use large objects on 64-bit.

10 years agoam 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
Tim Murray [Thu, 12 Jun 2014 23:05:16 +0000 (23:05 +0000)]
am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."

* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.

10 years agoam 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."
Nick Kralevich [Thu, 12 Jun 2014 21:10:30 +0000 (21:10 +0000)]
am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."

* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.

10 years agoMerge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
Jeff Brown [Fri, 13 Jun 2014 03:03:47 +0000 (03:03 +0000)]
Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev

10 years agoSuppress haptic feedback for SLEEP key when already asleep.
Jeff Brown [Fri, 13 Jun 2014 02:59:45 +0000 (19:59 -0700)]
Suppress haptic feedback for SLEEP key when already asleep.

Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4

10 years agoWhen watch is docked, home key press should launch dock home.
Jeff Brown [Fri, 13 Jun 2014 02:19:15 +0000 (19:19 -0700)]
When watch is docked, home key press should launch dock home.

Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568

10 years agoam 1ef888e5: Merge "Add service_contexts to policy update bundles."
Nick Kralevich [Thu, 12 Jun 2014 21:07:25 +0000 (21:07 +0000)]
am 1ef888e5: Merge "Add service_contexts to policy update bundles."

* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.

10 years agoFix permission problem and NPE
Craig Mautner [Thu, 12 Jun 2014 20:39:24 +0000 (13:39 -0700)]
Fix permission problem and NPE

Remove uid before calling into Window Manager. Restore afterwards.

Check for null stack value before dereferencing.

Fixes bug 15591112.

Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8

10 years agoam 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 12 Jun 2014 20:04:12 +0000 (20:04 +0000)]
am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev

* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
  LayoutLib fixes for API 20 [DO NOT MERGE]

10 years agoam 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations...
Scott Main [Thu, 12 Jun 2014 19:04:34 +0000 (19:04 +0000)]
am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev

* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.

10 years agoam 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on...
Andrew Solovay [Thu, 12 Jun 2014 17:27:48 +0000 (17:27 +0000)]
am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

10 years agoam 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android...
Andrew Solovay [Thu, 12 Jun 2014 17:23:31 +0000 (17:23 +0000)]
am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

10 years agoam ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART...
Andrew Solovay [Thu, 12 Jun 2014 17:19:33 +0000 (17:19 +0000)]
am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

10 years agoMerge "When watch is docked, home key press should launch dock home." into klp-modula...
Jeff Brown [Fri, 13 Jun 2014 03:00:41 +0000 (03:00 +0000)]
Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev

10 years agoMerge "Move FieldPacker over to use large objects on 64-bit."
Tim Murray [Thu, 12 Jun 2014 23:02:48 +0000 (23:02 +0000)]
Merge "Move FieldPacker over to use large objects on 64-bit."

10 years agoMove FieldPacker over to use large objects on 64-bit.
Tim Murray [Thu, 12 Jun 2014 21:17:53 +0000 (14:17 -0700)]
Move FieldPacker over to use large objects on 64-bit.

Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28

10 years agoMerge "Add service_contexts to policy update bundles."
Nick Kralevich [Thu, 12 Jun 2014 21:00:53 +0000 (21:00 +0000)]
Merge "Add service_contexts to policy update bundles."

10 years agoAdd service_contexts to policy update bundles.
Riley Spahn [Wed, 11 Jun 2014 22:26:28 +0000 (15:26 -0700)]
Add service_contexts to policy update bundles.

Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.

Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b

10 years agoam 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
Dirk Dougherty [Thu, 12 Jun 2014 02:44:11 +0000 (02:44 +0000)]
am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.

* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.

10 years agoam b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
Dirk Dougherty [Thu, 12 Jun 2014 02:41:07 +0000 (02:41 +0000)]
am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.

* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.

10 years agoam bdcd6fc7: Doc change: Update monetization docs.
Dirk Dougherty [Thu, 12 Jun 2014 02:37:27 +0000 (02:37 +0000)]
am bdcd6fc7: Doc change: Update monetization docs.

* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.

10 years agoDoc change: Update monetization docs.
Dirk Dougherty [Tue, 10 Jun 2014 21:35:17 +0000 (14:35 -0700)]
Doc change: Update monetization docs.

Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053

10 years agoam 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
Elliott Hughes [Thu, 12 Jun 2014 00:06:20 +0000 (00:06 +0000)]
am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."

* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.

10 years agoam 1a3908e9: Merge "Switch to a type-safe album art interface."
Elliott Hughes [Thu, 12 Jun 2014 00:02:42 +0000 (00:02 +0000)]
am 1a3908e9: Merge "Switch to a type-safe album art interface."

* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.

10 years agoam 4a9f1298: Close ActivityView and ActivityContainer cleanly.
Craig Mautner [Thu, 12 Jun 2014 00:00:17 +0000 (00:00 +0000)]
am 4a9f1298: Close ActivityView and ActivityContainer cleanly.

* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.

10 years agoClose ActivityView and ActivityContainer cleanly.
Craig Mautner [Wed, 11 Jun 2014 20:44:50 +0000 (13:44 -0700)]
Close ActivityView and ActivityContainer cleanly.

- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23

10 years agoMerge "reorg the SDK setup docs to streamline setup for all variations. Move ADT...
Scott Main [Thu, 12 Jun 2014 19:00:42 +0000 (19:00 +0000)]
Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev

10 years agoreorg the SDK setup docs to streamline setup for all variations.
Scott Main [Fri, 30 May 2014 00:44:09 +0000 (17:44 -0700)]
reorg the SDK setup docs to streamline setup for all variations.
Move ADT plugin to the ADT help doc and combine the three setup guides
into one page that is dynamic based on a URL parameter.

Change-Id: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741

10 years agoam e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
Craig Mautner [Wed, 11 Jun 2014 17:42:06 +0000 (17:42 +0000)]
am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev

* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.

10 years agoam b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the...
Calin Juravle [Wed, 11 Jun 2014 17:32:50 +0000 (17:32 +0000)]
am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"

* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size

10 years agoam b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
Calin Juravle [Wed, 11 Jun 2014 17:32:40 +0000 (17:32 +0000)]
am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"

* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment

10 years agoam 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property...
Calin Juravle [Wed, 11 Jun 2014 17:28:33 +0000 (17:28 +0000)]
am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"

* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size

10 years agoam 2f84b69b: Merge "Improved profile.start-immediately comment"
Calin Juravle [Wed, 11 Jun 2014 17:28:29 +0000 (17:28 +0000)]
am 2f84b69b: Merge "Improved profile.start-immediately comment"

* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment

10 years agoMerge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
Craig Mautner [Wed, 11 Jun 2014 17:39:19 +0000 (17:39 +0000)]
Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev

10 years agoam 9f637d10: Reduce notification service historical archive size to 1 for watches...
Griff Hazen [Wed, 11 Jun 2014 01:18:36 +0000 (01:18 +0000)]
am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint

* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint

10 years agoReduce notification service historical archive size to 1 for watches.
Griff Hazen [Tue, 10 Jun 2014 18:13:51 +0000 (11:13 -0700)]
Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38

10 years agoMerge "Switch to a type-safe album art interface."
Elliott Hughes [Wed, 11 Jun 2014 23:59:33 +0000 (23:59 +0000)]
Merge "Switch to a type-safe album art interface."

10 years agoSwitch to a type-safe album art interface.
Elliott Hughes [Tue, 10 Jun 2014 23:53:31 +0000 (16:53 -0700)]
Switch to a type-safe album art interface.

(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a

10 years agoMerge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 12 Jun 2014 20:00:10 +0000 (20:00 +0000)]
Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev

10 years agoLayoutLib fixes for API 20 [DO NOT MERGE]
Deepanshu Gupta [Thu, 12 Jun 2014 18:46:19 +0000 (11:46 -0700)]
LayoutLib fixes for API 20 [DO NOT MERGE]

Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330

10 years agoMerge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into...
Andrew Solovay [Thu, 12 Jun 2014 17:16:37 +0000 (17:16 +0000)]
Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

10 years agoMerge "Shrink profiler.start-immediately to fit in the maximum property size"
Calin Juravle [Wed, 11 Jun 2014 17:25:10 +0000 (17:25 +0000)]
Merge "Shrink profiler.start-immediately to fit in the maximum property size"

10 years agoShrink profiler.start-immediately to fit in the maximum property size
Calin Juravle [Wed, 11 Jun 2014 17:21:41 +0000 (18:21 +0100)]
Shrink profiler.start-immediately to fit in the maximum property size

Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf

10 years agoMerge "Improved profile.start-immediately comment"
Calin Juravle [Wed, 11 Jun 2014 17:25:02 +0000 (17:25 +0000)]
Merge "Improved profile.start-immediately comment"

10 years agoAdd NO_ANIMATION flag to ActivityView Intents.
Craig Mautner [Tue, 10 Jun 2014 20:31:02 +0000 (13:31 -0700)]
Add NO_ANIMATION flag to ActivityView Intents.

Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.

Fixes bug 15393526.

Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d

10 years agoam 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add...
Robert Ly [Tue, 10 Jun 2014 18:35:28 +0000 (18:35 +0000)]
am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '748856f2d91bd985af3b0973c4953cfa9a6a95ca':
  Add documentation for AndroidKeyStore

10 years agoam 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView...
Justin Koh [Tue, 10 Jun 2014 18:35:20 +0000 (18:35 +0000)]
am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev

* commit '42c53fd64641d3c2974b3b8f25a2c600f4c4dd7d':
  Catch OperationUnsupportedException when linkifying using WebView

10 years agoam b7c39cee: Remove WebIconDatabase calls from android.provider.Browser
Justin Koh [Tue, 10 Jun 2014 18:35:15 +0000 (18:35 +0000)]
am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser

* commit 'b7c39cee9ef3b6c58987128cef77c75cc2eab215':
  Remove WebIconDatabase calls from android.provider.Browser

10 years agoImproved profile.start-immediately comment
Calin Juravle [Tue, 10 Jun 2014 13:52:24 +0000 (14:52 +0100)]
Improved profile.start-immediately comment

Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e

10 years agoam a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation...
Robert Ly [Tue, 10 Jun 2014 02:49:18 +0000 (02:49 +0000)]
am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit 'a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
  Add documentation for AndroidKeyStore

10 years agoam 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:44:08 +0000 (02:44 +0000)]
am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore

10 years agoam f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:39:28 +0000 (02:39 +0000)]
am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore

10 years agoam 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:36:10 +0000 (02:36 +0000)]
am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore

10 years agoam 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:32:29 +0000 (02:32 +0000)]
am 716cc7dc: Add documentation for AndroidKeyStore

* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore

10 years agoMerge "Catch OperationUnsupportedException when linkifying using WebView" into klp...
Justin Koh [Tue, 10 Jun 2014 01:05:05 +0000 (01:05 +0000)]
Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev

10 years agoCatch OperationUnsupportedException when linkifying using WebView
Aaron Whyte [Fri, 6 Jun 2014 23:41:38 +0000 (16:41 -0700)]
Catch OperationUnsupportedException when linkifying using WebView

This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d

10 years agoRemove WebIconDatabase calls from android.provider.Browser
Justin Koh [Mon, 9 Jun 2014 21:59:17 +0000 (14:59 -0700)]
Remove WebIconDatabase calls from android.provider.Browser

This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb

10 years agoam 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on...
Amit Mahajan [Mon, 9 Jun 2014 21:12:43 +0000 (21:12 +0000)]
am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
  Handle provisioning APN by turning off/on radio.

10 years agoam eba8782a: Add NPE check to getSystemWindowInsets
Justin Koh [Mon, 9 Jun 2014 21:12:39 +0000 (21:12 +0000)]
am eba8782a: Add NPE check to getSystemWindowInsets

* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets

10 years agoam a5de8479: Merge "Fix Browser when running on a platform without webview" into...
Justin Koh [Mon, 9 Jun 2014 21:12:35 +0000 (21:12 +0000)]
am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev

* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview

10 years agoam e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs
Robert Ly [Mon, 9 Jun 2014 21:12:31 +0000 (21:12 +0000)]
am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs

* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
  remove erroneous file

10 years agoam 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into...
Adam Lesinski [Mon, 9 Jun 2014 21:12:25 +0000 (21:12 +0000)]
am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl

10 years agoam 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev
Michael Kolb [Mon, 9 Jun 2014 21:12:19 +0000 (21:12 +0000)]
am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev

* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
  Remove circular mask

10 years agoam e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
Amit Mahajan [Mon, 9 Jun 2014 19:50:09 +0000 (19:50 +0000)]
am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.

10 years agoam 20c5ce50: Handle provisioning APN by turning off/on radio.
Amit Mahajan [Mon, 9 Jun 2014 19:46:01 +0000 (19:46 +0000)]
am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.

10 years agoAdd NPE check to getSystemWindowInsets
Justin Koh [Fri, 6 Jun 2014 19:13:16 +0000 (12:13 -0700)]
Add NPE check to getSystemWindowInsets

Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d

10 years agoMerge "Fix Browser when running on a platform without webview" into klp-modular-dev
Justin Koh [Mon, 9 Jun 2014 18:29:39 +0000 (18:29 +0000)]
Merge "Fix Browser when running on a platform without webview" into klp-modular-dev

10 years agoFix Browser when running on a platform without webview
Justin Koh [Mon, 9 Jun 2014 00:04:17 +0000 (17:04 -0700)]
Fix Browser when running on a platform without webview

Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916

10 years agoHandle provisioning APN by turning off/on radio.
Amit Mahajan [Fri, 6 Jun 2014 23:53:34 +0000 (16:53 -0700)]
Handle provisioning APN by turning off/on radio.

The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81

10 years agodocs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
Andrew Solovay [Tue, 20 May 2014 22:50:13 +0000 (15:50 -0700)]
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

Contains information for developers to make sure their apps work properly
with the ART runtime.

This doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html

This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.

Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3

10 years agoam 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs
Robert Ly [Mon, 9 Jun 2014 16:54:45 +0000 (16:54 +0000)]
am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs

* commit '5cb180541332d652ed661559dfaa55a0fcc3751b':
  remove erroneous file

10 years agoam de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner...
Elliott Hughes [Mon, 9 Jun 2014 16:33:39 +0000 (16:33 +0000)]
am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."

* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.

10 years agoam 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbum...
Elliott Hughes [Mon, 9 Jun 2014 16:30:03 +0000 (16:30 +0000)]
am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."

* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.

10 years agoMerge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
Elliott Hughes [Mon, 9 Jun 2014 16:26:27 +0000 (16:26 +0000)]
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."

10 years agoFix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Elliott Hughes [Mon, 9 Jun 2014 16:22:58 +0000 (09:22 -0700)]
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.

Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5

10 years agoam db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
Robin Lee [Mon, 9 Jun 2014 12:55:13 +0000 (12:55 +0000)]
am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"

* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId