OSDN Git Service

android-x86/frameworks-base.git
9 years agoMake sure fingerprint error messages are handled in Keyguard
Jorim Jaggi [Fri, 1 May 2015 22:08:34 +0000 (15:08 -0700)]
Make sure fingerprint error messages are handled in Keyguard

Change-Id: I332c08c5e94cf58a2d3f696860511c1a84fecda5

9 years agoMerge "Cleanup properties" into mnc-dev
Chris Craik [Tue, 5 May 2015 21:30:08 +0000 (21:30 +0000)]
Merge "Cleanup properties" into mnc-dev

9 years agoMerge "Dump profile info after running test" into mnc-dev
John Reck [Tue, 5 May 2015 21:15:26 +0000 (21:15 +0000)]
Merge "Dump profile info after running test" into mnc-dev

9 years agoMerge "WiFi Calling: Show different operator name string in Data usage dialog." into...
Pavel Zhamaitsiak [Tue, 5 May 2015 21:05:48 +0000 (21:05 +0000)]
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev

9 years agoMerge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev
Adrian Roos [Tue, 5 May 2015 21:05:33 +0000 (21:05 +0000)]
Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev

9 years agoWiFi Calling: Show different operator name string in Data usage dialog.
Pavel Zhamaitsiak [Fri, 27 Mar 2015 16:24:47 +0000 (09:24 -0700)]
WiFi Calling: Show different operator name string in Data usage dialog.

Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
(cherry picked from lmp-mr1-wfc-dev)

9 years agoMerge "Only enable fingerprint auth after first regular auth" into mnc-dev
Jorim Jaggi [Tue, 5 May 2015 20:51:17 +0000 (20:51 +0000)]
Merge "Only enable fingerprint auth after first regular auth" into mnc-dev

9 years agoMerge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev
John Spurlock [Tue, 5 May 2015 20:43:53 +0000 (20:43 +0000)]
Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev

9 years agoMerge "Fix binder force gc will block binder thread" into mnc-dev
Hiroshi Yamauchi [Tue, 5 May 2015 20:31:40 +0000 (20:31 +0000)]
Merge "Fix binder force gc will block binder thread" into mnc-dev

9 years agoMerge "Update permissions on memory usage instrumentation" into mnc-dev
Prabhakar Thirumoorthy [Tue, 5 May 2015 20:06:50 +0000 (20:06 +0000)]
Merge "Update permissions on memory usage instrumentation" into mnc-dev

9 years agoDump profile info after running test
John Reck [Tue, 5 May 2015 18:00:53 +0000 (11:00 -0700)]
Dump profile info after running test

Bug: 20824843

Not really a proper "benchmark mode" but it turns out
we already have reasonably good profile data, so tweak
the test app to spit it out after a run.

Change-Id: Iaee9c0d61b5508daf282fe5f95d0b37ee419a8f1

9 years agoFix binder force gc will block binder thread
Hiroshi Yamauchi [Tue, 5 May 2015 19:15:26 +0000 (12:15 -0700)]
Fix binder force gc will block binder thread

Symptom: Force gc caused activity launch time took longer
Root Cause: Runtime.getRuntime().gc will block binder thread
Solution: Use VMRuntime.requestConcurrentGC() will not block binder
thread

(cherry pick commit d916c233f0ed615667c1c2338c779e819098d135)

Bug: 20554807
Change-Id: Ia9fecea51d2b0a6635e037b5f2bfcb8eb87f4103

9 years agoUpdate permissions on memory usage instrumentation
Maxim Siniavine [Tue, 5 May 2015 19:00:24 +0000 (12:00 -0700)]
Update permissions on memory usage instrumentation

Change-Id: I0c2bbd893252eb1dc3cf8b93b787efd772317216

9 years agoMerge "Cherry pick beefed-up error handling in the CopyService from master. DO NOT...
Ben Kwa [Tue, 5 May 2015 18:54:04 +0000 (18:54 +0000)]
Merge "Cherry pick beefed-up error handling in the CopyService from   DO NOT MERGE" into mnc-dev

9 years agoVolume A11y: Prevent auto-dismiss when feedback enabled.
John Spurlock [Tue, 5 May 2015 18:50:43 +0000 (14:50 -0400)]
Volume A11y: Prevent auto-dismiss when feedback enabled.

 - Prevent the volume dialog from timing out when feedback is enabled.
 - Use the a11y events as an additional user activity signal.
 - Add content descriptions for the dialog icon buttons.

Bug: 20172022
Change-Id: Id5cd29d9cee27fded2fc8a029913cfcc2b68c152

9 years agoOnly enable fingerprint auth after first regular auth
Jorim Jaggi [Fri, 1 May 2015 21:28:49 +0000 (14:28 -0700)]
Only enable fingerprint auth after first regular auth

- Add method hasUserAuthenticatedSinceBoot to TrustManagerService
- Use this information to only enable fingerprint auth after the user
has at least once authenticated with his regular authentication
method.

Change-Id: Icf073ac3b340d557b044f6bf27f1a7f8511048e2

9 years agoam a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New...
Andrew Solovay [Tue, 5 May 2015 18:25:05 +0000 (18:25 +0000)]
am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'a4d0e5282c83391c830c8bff2cb138214f5bfe79':

9 years agoam d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh...
Andrew Solovay [Tue, 5 May 2015 18:15:35 +0000 (18:15 +0000)]
am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'd8039f048db26847a3da5367a0b69e2bd3f340e0':

9 years agomedia: Added MPEG2 profile/levels and tests
Harish Mahendrakar [Sat, 18 Apr 2015 04:34:39 +0000 (10:04 +0530)]
media: Added MPEG2 profile/levels and tests

Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35

9 years agoam 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training...
Andrew Solovay [Tue, 5 May 2015 18:01:14 +0000 (18:01 +0000)]
am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit '7916753474be29f117d2f31dc4c6bc76ff76b92f':
  Docs: New swipe-to-refresh training guide.

9 years agoMerge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-dev
Tony Mantler [Tue, 5 May 2015 17:59:00 +0000 (17:59 +0000)]
Merge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-dev

9 years agoMerge "Sanity checks in JNI code for closure creation" into mnc-dev
Yang Ni [Tue, 5 May 2015 17:48:52 +0000 (17:48 +0000)]
Merge "Sanity checks in JNI code for closure creation" into mnc-dev

9 years agoMerge "Fix NPE in Html.inParagraph()" into mnc-dev
Raph Levien [Tue, 5 May 2015 17:43:27 +0000 (17:43 +0000)]
Merge "Fix NPE in Html.inParagraph()" into mnc-dev

9 years agoCleanup properties
Chris Craik [Mon, 4 May 2015 21:36:49 +0000 (14:36 -0700)]
Cleanup properties

bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9

9 years agoMerge "Fixing docs." into mnc-dev
Julia Reynolds [Tue, 5 May 2015 17:24:32 +0000 (17:24 +0000)]
Merge "Fixing docs." into mnc-dev

9 years agoFixing docs.
Julia Reynolds [Tue, 5 May 2015 15:44:20 +0000 (11:44 -0400)]
Fixing docs.

Bug: 20823970
Bug: 20820224
Change-Id: If6b5c43ae5cf88bd5a09adc60c1204ba9e6ab459

9 years agoMerge "Add hidden methods to set/get default dialer across users" into mnc-dev
Yorke Lee [Tue, 5 May 2015 17:15:13 +0000 (17:15 +0000)]
Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

9 years agoFix NPE in Html.inParagraph()
Raph Levien [Tue, 5 May 2015 17:13:54 +0000 (10:13 -0700)]
Fix NPE in Html.inParagraph()

The typeface in a TypefaceSpan can be the null string. This patch
fixes the string comparison to not throw a NullPointerException.

Bug: 20849738
Change-Id: Ied049305794966bcbca00cfd11fe97a91b685d79

9 years agoMerge "Add some basic DA unit tests" into mnc-dev
John Reck [Tue, 5 May 2015 17:12:00 +0000 (17:12 +0000)]
Merge "Add some basic DA unit tests" into mnc-dev

9 years agoAdd some basic DA unit tests
John Reck [Tue, 5 May 2015 15:38:36 +0000 (08:38 -0700)]
Add some basic DA unit tests

Change-Id: I01e32a8f0db34a27672010cea275de32d7500dd7

9 years agoSettings UI for SIM access profile (2/2)
Casper Bonde [Tue, 5 May 2015 05:07:45 +0000 (22:07 -0700)]
Settings UI for SIM access profile (2/2)

Change-Id: I2e44a858ee3f3349baa401ee7002186d3ae19412

9 years agoMerge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
Alan Viverette [Tue, 5 May 2015 16:50:27 +0000 (16:50 +0000)]
Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev

9 years agoAdd API for obtaining changing configurations bitmask from Theme
Alan Viverette [Tue, 5 May 2015 16:49:03 +0000 (09:49 -0700)]
Add API for obtaining changing configurations bitmask from Theme

Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514

9 years agoMerge "AudioRecord JNI: use default UID / PID" into mnc-dev
Jean-Michel Trivi [Tue, 5 May 2015 15:55:07 +0000 (15:55 +0000)]
Merge "AudioRecord JNI: use default UID / PID" into mnc-dev

9 years agoMerge "Call Activity#onAttachFragment()" into mnc-dev
Todd Kennedy [Tue, 5 May 2015 15:53:27 +0000 (15:53 +0000)]
Merge "Call Activity#onAttachFragment()" into mnc-dev

9 years agoMerge "Call profile changed in cases were focused activity is nulled." into mnc-dev
Kenny Guy [Tue, 5 May 2015 15:36:49 +0000 (15:36 +0000)]
Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev

9 years agoMerge "Permission UI - legacy apps support" into mnc-dev
Svet Ganov [Tue, 5 May 2015 15:34:08 +0000 (15:34 +0000)]
Merge "Permission UI - legacy apps support" into mnc-dev

9 years agoPermission UI - legacy apps support
Svet Ganov [Mon, 4 May 2015 18:07:38 +0000 (11:07 -0700)]
Permission UI - legacy apps support

Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4

9 years agoMerge "Attempt to solve the double-GC problem" into mnc-dev
John Reck [Tue, 5 May 2015 14:50:48 +0000 (14:50 +0000)]
Merge "Attempt to solve the double-GC problem" into mnc-dev

9 years agoMerge "Zen: Remove calendar rule attendance attribute." into mnc-dev
John Spurlock [Tue, 5 May 2015 14:42:01 +0000 (14:42 +0000)]
Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev

9 years agoZen: Remove calendar rule attendance attribute.
John Spurlock [Tue, 5 May 2015 13:49:32 +0000 (09:49 -0400)]
Zen: Remove calendar rule attendance attribute.

 - No longer supporting a filter based on attendance type.
 - Remove from model + condition provider logic.

Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05

9 years agoRemove dead code from IMMS.
Seigo Nonaka [Mon, 4 May 2015 23:53:24 +0000 (16:53 -0700)]
Remove dead code from IMMS.

MSG_SHOW_IM_PICKER is no longer used.  Also by removing that message, we
can simplify showInputMethodMenu/showINputMethodSubtypeMenu.

Change-Id: I7002ff063e490928309e9a9a0f6557ce3d12e6aa

9 years agoam 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/footer...
Dirk Dougherty [Tue, 5 May 2015 02:46:40 +0000 (02:46 +0000)]
am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs

* commit '08c72b91bedefbebe0547646544cd875c1062af0':
  Doc change: merge landing page and header/footer designs.

9 years agoam ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into...
Dirk Dougherty [Tue, 5 May 2015 02:34:51 +0000 (02:34 +0000)]
am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs

* commit 'ecfed34d3e71bfceae11493b8441a051e803ec05':
  Doc change: merge landing page and header/footer designs.

9 years agoMerge "Doc change: merge landing page and header/footer designs." into mnc-preview...
Dirk Dougherty [Tue, 5 May 2015 02:27:46 +0000 (02:27 +0000)]
Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs

9 years agoAudioRecord JNI: use default UID / PID
Jean-Michel Trivi [Sat, 2 May 2015 01:48:29 +0000 (18:48 -0700)]
AudioRecord JNI: use default UID / PID

Bug 20832981

Change-Id: I887e38a4e95c9f4b9360f831b3dfc0073d151706

9 years agoam 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migra...
Rich Slogar [Tue, 5 May 2015 01:48:06 +0000 (01:48 +0000)]
am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs

* commit '2f6261534b0916714715ffa9e2800716dd900eb8':
  docs: Update Eclipse migrate procedure

9 years agoam 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh...
Andrew Solovay [Tue, 5 May 2015 01:48:00 +0000 (01:48 +0000)]
am 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit '168bbcef02603b35b9fad53d923310b9a80acb5b':
  Docs: New swipe-to-refresh training guide.

9 years agoMerge changes from topic 'mwd-merge-050415' into mnc-dev
Prerepa Viswanadham [Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)]
Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge

9 years agoam 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure...
Rich Slogar [Tue, 5 May 2015 00:59:34 +0000 (00:59 +0000)]
am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs

* commit '39220a7e924e659dffccd94ea7680f3ef8ac14b6':
  docs: Update Eclipse migrate procedure

9 years agoam 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training...
Andrew Solovay [Tue, 5 May 2015 00:59:30 +0000 (00:59 +0000)]
am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit '65241c66974053203a66c11cd27678b84f65691c':
  Docs: New swipe-to-refresh training guide.

9 years agoAdd hidden methods to set/get default dialer across users
Yorke Lee [Tue, 5 May 2015 00:07:32 +0000 (17:07 -0700)]
Add hidden methods to set/get default dialer across users

First part of a set of changes to make the default dialer work
across multiple users. This initial CL should not affect any
user-facing behavior, just add new methods.

Bug: 20696062
Change-Id: If1651240e185b4c09e960260c822c9265069fb9a

9 years agoMerge "Add user selectable Default Browser feature - part 5" into mnc-dev
Fabrice Di Meglio [Tue, 5 May 2015 00:11:05 +0000 (00:11 +0000)]
Merge "Add user selectable Default Browser feature - part 5" into mnc-dev

9 years agoAdd user selectable Default Browser feature - part 5
Fabrice Di Meglio [Tue, 5 May 2015 00:06:33 +0000 (17:06 -0700)]
Add user selectable Default Browser feature - part 5

- check and clear default Browser if its package is no more available

See bug #20144393

Change-Id: I60a1b8f11058f3a4f9dc80440027ab72fe7cce2e

9 years agoMerge "AAPT2: Add option to generate static library" into mnc-dev
Adam Lesinski [Mon, 4 May 2015 23:58:23 +0000 (23:58 +0000)]
Merge "AAPT2: Add option to generate static library" into mnc-dev

9 years agoMerge "AAPT2: Include package name of attributes in styleable from another package...
Adam Lesinski [Mon, 4 May 2015 23:57:21 +0000 (23:57 +0000)]
Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev

9 years agoMerge "AAPT2: Record public status in a more robust way" into mnc-dev
Adam Lesinski [Mon, 4 May 2015 23:56:22 +0000 (23:56 +0000)]
Merge "AAPT2: Record public status in a more robust way" into mnc-dev

9 years agoMerge "Add namespace handling in attribute values" into mnc-dev
Adam Lesinski [Mon, 4 May 2015 23:54:14 +0000 (23:54 +0000)]
Merge "Add namespace handling in attribute values" into mnc-dev

9 years agoMerge "Update emergency call button label when language changes" into mnc-dev
Jorim Jaggi [Mon, 4 May 2015 23:51:20 +0000 (23:51 +0000)]
Merge "Update emergency call button label when language changes" into mnc-dev

9 years agoMerge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev
Robert Shih [Mon, 4 May 2015 23:50:06 +0000 (23:50 +0000)]
Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev

9 years agoUpdate emergency call button label when language changes
Jorim Jaggi [Mon, 4 May 2015 22:34:22 +0000 (15:34 -0700)]
Update emergency call button label when language changes

Bug: 17987231
Change-Id: I74fe6942f4ff965537803d61f3446d5f28a60f9e

9 years agoTrack unlock attempts per user.
Jorim Jaggi [Mon, 4 May 2015 22:22:40 +0000 (15:22 -0700)]
Track unlock attempts per user.

Bug: 19330825
Change-Id: I3e09f676b945dbeee16dc0fb3cb126cb884a6934

9 years agoAAPT2: Add option to generate static library
Adam Lesinski [Fri, 1 May 2015 21:47:28 +0000 (14:47 -0700)]
AAPT2: Add option to generate static library

Difference between normal app and static library is that
the R file uses non-final fields, and the extra chunks added
by AAPT2 remain in the final APK.

Change-Id: I61416387ca9bb3c21857ff7cfab5847ac3edf57a

9 years agoAAPT2: Include package name of attributes in styleable from another package
Adam Lesinski [Fri, 1 May 2015 20:14:05 +0000 (13:14 -0700)]
AAPT2: Include package name of attributes in styleable from another package

Change-Id: I44f902e297238e7ee4ae27c02aaaf9e148652d2a

9 years agoAAPT2: Record public status in a more robust way
Adam Lesinski [Fri, 1 May 2015 00:40:46 +0000 (17:40 -0700)]
AAPT2: Record public status in a more robust way

This allows us to store the source and comments of a resource's
public declaration and avoids issues where there is no default
configuration for a publicly declared resource (like with drawables
of various densities) and AAPT2 mistakenly took this as an error.

Change-Id: I07a2fe9f551daefcce842f205fb219d2fa453ebc

9 years agoAdd namespace handling in attribute values
Adam Lesinski [Sat, 25 Apr 2015 02:19:30 +0000 (19:19 -0700)]
Add namespace handling in attribute values

Previously, you could only reference namespace prefixes in attribute names:

<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
      appcompat:name="hey"
      ...

Now you can also reference them in resource names within an attribute value:

      ...
      android:text="@appcompat:string/confirm"
      ...

Which will be treated as "@android.support.v7.appcompat:string/confirm".

Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52

9 years agoMediaPlayer: setSubtitleAnchor on a HandlerThread
Robert Shih [Mon, 4 May 2015 16:38:31 +0000 (09:38 -0700)]
MediaPlayer: setSubtitleAnchor on a HandlerThread

This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.

Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f

9 years agoBluetoothSap class should not be public
Andre Eisenbach [Mon, 4 May 2015 20:28:04 +0000 (13:28 -0700)]
BluetoothSap class should not be public

Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67

9 years agoMerge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev
Wei Jia [Mon, 4 May 2015 23:14:15 +0000 (23:14 +0000)]
Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

9 years agoAttempt to solve the double-GC problem
John Reck [Tue, 7 Apr 2015 14:32:03 +0000 (07:32 -0700)]
Attempt to solve the double-GC problem

Fix the issue where Bitmap requires two GC passes
to release its byte[] by using some questionable
ref-counting hacks to manage whether or not
native has a strong or weak ref to the byte[]

Change-Id: Ia90a883579f61c0b1904b5549a66bd0ef34b32c5

9 years agoMediaSync: clean up configureAudioTrack and configureSurface.
Wei Jia [Mon, 4 May 2015 22:59:20 +0000 (15:59 -0700)]
MediaSync: clean up configureAudioTrack and configureSurface.

Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d

9 years agoam 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard updat...
Joe Fernandez [Mon, 4 May 2015 22:19:56 +0000 (22:19 +0000)]
am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit '722b509df505c156c71e95336b8059b8afcd8621':
  docs: Android Developer Dashboard update - May 2015

9 years agoam 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0...
Rich Slogar [Mon, 4 May 2015 22:19:46 +0000 (22:19 +0000)]
am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '0d13312552030dce0499fd9201c8e17b92aa8a4d':

9 years agoam fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove...
Dirk Dougherty [Mon, 4 May 2015 22:19:39 +0000 (22:19 +0000)]
am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.

* commit 'fd92db9c843042ab66f76d11a733493819d8c2c9':
  Update N6 device art port image to remove shadow.

9 years agoam 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions
Rich Slogar [Mon, 4 May 2015 22:19:33 +0000 (22:19 +0000)]
am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '5bf92cbab9e6df7fb918c925fd506737a9e25c4e':
  docs: sdk 24.2.0 revisions

9 years agoam 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview...
Joe Fernandez [Mon, 4 May 2015 22:19:23 +0000 (22:19 +0000)]
am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs

* commit '419aff0fd39c565d52c21a845e346c691f3ec4fb':
  docs: M Preview mini site skeleton

9 years agoSanity checks in JNI code for closure creation
Yang Ni [Thu, 30 Apr 2015 23:13:54 +0000 (16:13 -0700)]
Sanity checks in JNI code for closure creation

b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
(cherry picked from commit 4e90b9b57cc96964a9d5c1845172a72cb51feafb)

9 years agoMerge "Fix potential NPE in internal isValidTarget method." into mnc-dev
George Mount [Mon, 4 May 2015 22:08:02 +0000 (22:08 +0000)]
Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

9 years agoFix potential NPE in internal isValidTarget method.
George Mount [Mon, 4 May 2015 22:01:55 +0000 (15:01 -0700)]
Fix potential NPE in internal isValidTarget method.

Bug 19805383

Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd

9 years agoAdd documentation for BluetoothSocket.getConnectionType()
Andre Eisenbach [Mon, 4 May 2015 20:48:50 +0000 (13:48 -0700)]
Add documentation for BluetoothSocket.getConnectionType()

Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b

9 years agoMerge "When returning, transition only existing shared elements." into mnc-dev
George Mount [Mon, 4 May 2015 21:48:52 +0000 (21:48 +0000)]
Merge "When returning, transition only existing shared elements." into mnc-dev

9 years agoWhen returning, transition only existing shared elements.
George Mount [Mon, 4 May 2015 21:12:40 +0000 (14:12 -0700)]
When returning, transition only existing shared elements.

Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b

9 years agoMerge "eliminate notification clicker garbage." into mnc-dev
Chris Wren [Mon, 4 May 2015 21:06:16 +0000 (21:06 +0000)]
Merge "eliminate notification clicker garbage." into mnc-dev

9 years agoeliminate notification clicker garbage.
Chris Wren [Fri, 1 May 2015 14:39:26 +0000 (10:39 -0400)]
eliminate notification clicker garbage.

Bug: 9739772
Change-Id: If05079cb0f956e03f26c7780c318452f73c3e849

9 years agoCall Activity#onAttachFragment()
Todd Kennedy [Mon, 4 May 2015 19:29:50 +0000 (12:29 -0700)]
Call Activity#onAttachFragment()

This was accidentally removed during the changes to abstract a Fragment host.
Also ensure Fragment#onInflate(Activity) gets invoked

Bug: 20825263
Change-Id: I981266ae1e8817db5c82ec4609bbcf4a5e676fee

9 years agoMerge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
Sanket Padawe [Mon, 4 May 2015 20:44:51 +0000 (20:44 +0000)]
Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev

9 years agoCherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE
Ben Kwa [Fri, 24 Apr 2015 22:35:25 +0000 (15:35 -0700)]
Cherry pick beefed-up error handling in the CopyService from   DO NOT MERGE

Send copy errors to the destination provider.
Big overhaul of tests to make them simpler.
Test that errors during copying are detected and partial copies are
cleaned up.
Test that copying empty directories works properly.

Change-Id: I3fe0e73bdc92c2b6f522857ca5631f6d03d5a666
(cherry picked from commit dae8c378d6c680ae9efa8e1202d9bc92fb0dfb11)

9 years agoMerge "Fix Visibility not changing until Animator ends." into mnc-dev
George Mount [Mon, 4 May 2015 20:26:47 +0000 (20:26 +0000)]
Merge "Fix Visibility not changing until Animator ends." into mnc-dev

9 years agoMerge "More documentation for handling RippleDrawable mask at run time" into mnc-dev
Alan Viverette [Mon, 4 May 2015 20:10:19 +0000 (20:10 +0000)]
Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev

9 years agoMerge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Mon, 4 May 2015 19:59:34 +0000 (19:59 +0000)]
Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

9 years agoMore documentation for handling RippleDrawable mask at run time
Alan Viverette [Mon, 4 May 2015 19:51:54 +0000 (12:51 -0700)]
More documentation for handling RippleDrawable mask at run time

The docs are now really explicit about the layer's ID and how to set
or update the mask layer from code.

Bug: 20493831
Change-Id: I801f10cd08fd1b4bb226c63a1bdf3271229928ea

9 years agoMerge "Always force constructors accessible during inflation" into mnc-dev
Alan Viverette [Mon, 4 May 2015 19:38:56 +0000 (19:38 +0000)]
Merge "Always force constructors accessible during inflation" into mnc-dev

9 years agoam 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp...
Rich Slogar [Mon, 4 May 2015 19:15:01 +0000 (19:15 +0000)]
am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs

* commit '023901c628f0f01fc05aa83b45e57f883fba21ea':
  docs: Update Eclipse migrate procedure

9 years agoam 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into...
Andrew Solovay [Mon, 4 May 2015 19:14:57 +0000 (19:14 +0000)]
am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit '9ceea140a3830794b202eec6be68a9a13e37c59f':
  Docs: New swipe-to-refresh training guide.

9 years agoMerge "Zen: Implement calendar event system condition provider." into mnc-dev
John Spurlock [Mon, 4 May 2015 19:07:29 +0000 (19:07 +0000)]
Merge "Zen: Implement calendar event system condition provider." into mnc-dev

9 years agoMerge "Avoid NPE when fsUuid is null." into mnc-dev
Jeff Sharkey [Mon, 4 May 2015 19:06:38 +0000 (19:06 +0000)]
Merge "Avoid NPE when fsUuid is null." into mnc-dev

9 years agoAvoid NPE when fsUuid is null.
Jeff Sharkey [Mon, 4 May 2015 19:04:09 +0000 (12:04 -0700)]
Avoid NPE when fsUuid is null.

Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1

9 years agoam ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
Rich Slogar [Mon, 4 May 2015 19:00:19 +0000 (19:00 +0000)]
am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs

* commit 'ffd0e519299d69b214fb7c96f96f3e34fc2bbf56':
  docs: Update Eclipse migrate procedure

9 years agoam c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into...
Andrew Solovay [Mon, 4 May 2015 18:44:50 +0000 (18:44 +0000)]
am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'c11741042d541f222a6cf19bc9cd15c2c892f150':
  Docs: New swipe-to-refresh training guide.

9 years agoMerge "docs: Update Eclipse migrate procedure" into lmp-docs
Rich Slogar [Mon, 4 May 2015 18:43:38 +0000 (18:43 +0000)]
Merge "docs: Update Eclipse migrate procedure" into lmp-docs