OSDN Git Service

android-x86/frameworks-base.git
9 years agoLayoutLib: Support getting resource arrays.
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays.

- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
  custom theme attributes. The AppTheme now inherits from
  Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d

9 years agoLayoutLib: Change nullity annotations.
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations.

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7

9 years agoMerge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
Dianne Hackborn [Sat, 23 May 2015 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

9 years agoMerge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
Simranjit Singh Kohli [Sat, 23 May 2015 00:20:38 +0000 (00:20 +0000)]
Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev

9 years agoam c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview...
Dirk Dougherty [Sat, 23 May 2015 00:19:53 +0000 (00:19 +0000)]
am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'c56a8313760243740b684fef4ae71d791a885b4d':
  Doc change: updates for preview.

9 years agoam 93cc5190: am b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:19:48 +0000 (00:19 +0000)]
am 93cc5190: am b373f49a: docs: NDK table of contents fixes

* commit '93cc51908c6d57d43f5a2ae98a850aaa67ac6b64':
  docs: NDK table of contents fixes

9 years ago[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Simranjit Singh Kohli [Fri, 22 May 2015 21:00:32 +0000 (14:00 -0700)]
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]

Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.

Bug: 13104800
Bug: 17926560
Bug: 9626001

Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1

9 years agoam b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'b1410bc306195dc807f223bc5955780275fc6468':
  Doc change: updates for preview.

9 years agoam b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am b373f49a: docs: NDK table of contents fixes

* commit 'b373f49a85fcbe82993940416ce04e0a1fb1e340':
  docs: NDK table of contents fixes

9 years agoMerge "Add getPermissionGrantState method in device policy" into mnc-dev
Amith Yamasani [Sat, 23 May 2015 00:05:46 +0000 (00:05 +0000)]
Merge "Add getPermissionGrantState method in device policy" into mnc-dev

9 years agoMerge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs

9 years agoDoc change: updates for preview.
Dirk Dougherty [Fri, 22 May 2015 23:58:14 +0000 (16:58 -0700)]
Doc change: updates for preview.

Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a

9 years agodocs: NDK table of contents fixes
Joe Fernandez [Fri, 22 May 2015 19:27:04 +0000 (12:27 -0700)]
docs: NDK table of contents fixes

- fixing the encoding of the left navigation files for
  - Guides
  - References
  - Samples
  - Downloads

Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae

9 years agoMerge "Camera: update available LSC map mode key type" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Camera: update available LSC map mode key type" into mnc-dev

9 years agoCamera: update available LSC map mode key type
Yin-Chia Yeh [Fri, 22 May 2015 23:37:27 +0000 (16:37 -0700)]
Camera: update available LSC map mode key type

Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64

9 years agoRevert "resolved conflicts for merge of 47249f2a to mnc-dev"
Dianne Hackborn [Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)]
Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.

9 years agoam 09ffc01d: am 61e6be64: Merge "Doc change: updates for preview content." into mnc...
Dirk Dougherty [Fri, 22 May 2015 23:29:29 +0000 (23:29 +0000)]
am 09ffc01d: am 61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs

* commit '09ffc01dd3bfd21410d4d620ca8f8c40d4688a86':
  Doc change: updates for preview content.

9 years agoam 61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:14:47 +0000 (23:14 +0000)]
am 61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs

* commit '61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c':
  Doc change: updates for preview content.

9 years agoMerge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:05:13 +0000 (23:05 +0000)]
Merge "Doc change: updates for preview content." into mnc-preview-docs

9 years agoDoc change: updates for preview content.
Dirk Dougherty [Fri, 22 May 2015 17:23:10 +0000 (10:23 -0700)]
Doc change: updates for preview content.

Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea

9 years agoam eed8e782: am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview...
David Friedman [Fri, 22 May 2015 22:45:35 +0000 (22:45 +0000)]
am eed8e782: am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs

* commit 'eed8e782ec22a11957c563e79010794571d43be9':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

9 years agoam dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs
David Friedman [Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)]
am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs

* commit 'dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

9 years agoresolved conflicts for merge of 7044ee16 to mnc-preview-docs
David Friedman [Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)]
resolved conflicts for merge of 7044ee16 to mnc-preview-docs

Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7

9 years agoMerge "No longer trigger immersive cling on panic" into mnc-dev
Adrian Roos [Fri, 22 May 2015 21:38:22 +0000 (21:38 +0000)]
Merge "No longer trigger immersive cling on panic" into mnc-dev

9 years agoMerge "Request transient bars after panic" into mnc-dev
Adrian Roos [Fri, 22 May 2015 21:37:56 +0000 (21:37 +0000)]
Merge "Request transient bars after panic" into mnc-dev

9 years agoMerge "Camera2: update FpsRange requirement" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 20:57:06 +0000 (20:57 +0000)]
Merge "Camera2: update FpsRange requirement" into mnc-dev

9 years agoAdd getPermissionGrantState method in device policy
Amith Yamasani [Fri, 22 May 2015 20:00:51 +0000 (13:00 -0700)]
Add getPermissionGrantState method in device policy

This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c

9 years agoCamera2: update FpsRange requirement
Yin-Chia Yeh [Thu, 21 May 2015 18:27:06 +0000 (11:27 -0700)]
Camera2: update FpsRange requirement

Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52

9 years agoMerge "Suppress benign clang warning." into mnc-dev
Chih-Hung Hsieh [Fri, 22 May 2015 20:38:24 +0000 (20:38 +0000)]
Merge "Suppress benign clang warning." into mnc-dev

9 years agoMerge "ImageReader: Register estimated native allocation" into mnc-dev
Chien-Yu Chen [Fri, 22 May 2015 20:33:25 +0000 (20:33 +0000)]
Merge "ImageReader: Register estimated native allocation" into mnc-dev

9 years agoam d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert...
Griff Hazen [Fri, 22 May 2015 20:23:00 +0000 (20:23 +0000)]
am d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit 'd2632a83668001065e6de9d38cc7166f309a2ca3':

9 years agoam cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce...
Griff Hazen [Fri, 22 May 2015 20:22:55 +0000 (20:22 +0000)]
am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit 'cc6029b82bb83faf237e3f718a5479db0c53d839':

9 years agoDoc update for MediaDrm's OnExpirationUpdate method
Jeff Tinker [Fri, 22 May 2015 18:53:54 +0000 (11:53 -0700)]
Doc update for MediaDrm's OnExpirationUpdate method

Based on EME spec clarification that expiration time
of 0 means unlimited.

bug: 21393975
Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222

9 years agoMerge "Fixed a flash when launching keyguard affordances" into mnc-dev
Selim Cinek [Fri, 22 May 2015 20:16:44 +0000 (20:16 +0000)]
Merge "Fixed a flash when launching keyguard affordances" into mnc-dev

9 years agoam 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionS...
Griff Hazen [Fri, 22 May 2015 20:07:11 +0000 (20:07 +0000)]
am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit '8f585128f5ce28219f4f56bef27caac139bbfbd7':

9 years agoam dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam...
Griff Hazen [Fri, 22 May 2015 20:07:06 +0000 (20:07 +0000)]
am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit 'dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f':

9 years agoam e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 19:50:14 +0000 (19:50 +0000)]
am e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

* commit 'e23031c974c9b051ba639f9ad68f891e2ae87da3':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

9 years agoMerge "Restore app expectations around drawable visibility change timing" into mnc-dev
Adam Powell [Fri, 22 May 2015 19:48:53 +0000 (19:48 +0000)]
Merge "Restore app expectations around drawable visibility change timing" into mnc-dev

9 years agoFixed a flash when launching keyguard affordances
Selim Cinek [Fri, 22 May 2015 19:38:44 +0000 (12:38 -0700)]
Fixed a flash when launching keyguard affordances

When media artwork was present the screen would briefly
show the artwork and the scrim when launching the affordances
on the keyguard.

Bug: 21379150
Change-Id: Ica36e7f7ef11beef9b2351af4cf43ab4e20151ac

9 years agoSuppress benign clang warning.
Chih-Hung Hsieh [Fri, 22 May 2015 19:28:03 +0000 (12:28 -0700)]
Suppress benign clang warning.

To unblock continuous clang/llvm builds.

BUG: 21337624
Change-Id: I38e5d11fd3c44f50430a3a8519c5071674b3df9f

9 years agoMerge "Improve reporting to apps of transaction too large failures." into mnc-dev
Dianne Hackborn [Fri, 22 May 2015 18:52:40 +0000 (18:52 +0000)]
Merge "Improve reporting to apps of transaction too large failures." into mnc-dev

9 years agoImageReader: Register estimated native allocation
Chien-Yu Chen [Fri, 22 May 2015 00:59:22 +0000 (17:59 -0700)]
ImageReader: Register estimated native allocation

Estimate the native allocation and register it so it can be
accounted for during GC.

Bug: 20299272
Change-Id: I43af3058b6fe9a41e5e7e119e390ed079402c4b8

9 years agoRestore app expectations around drawable visibility change timing
Adam Powell [Thu, 21 May 2015 01:26:35 +0000 (18:26 -0700)]
Restore app expectations around drawable visibility change timing

When we update drawable visibility has changed to be part of
View.onVisibilityChanged instead of an overload of
setVisibility. While this covers more cases that we were previously
missing, it also means that we now set drawable visibility from the
View constructor via the call chain view.setFlags to
view.onVisibilityChanged to drawable.setVisibility, resulting in us
passing a 'this' pointer all over before the object is fully
initialized. (i.e. a Bad Thing.)

In general we've gotten away with playing fast and loose with this
sort of thing as a part of view inflation - calling various non-final
setters that may invoke callbacks as needed rather than initializing
view fields directly. Unfortunately it also means that we can cause a
lot of hard to trace bugs and in the long run we should try to clean
up as much of it as we can.

In this case, some apps were expecting inflation to have finished
completely before any drawable visibility changed. If a view's
visibility changes but it's not attached to a window, does it make a
callback?

The fix: no. We won't dispatch onVisibilityChanged to detached views,
but we will dispatch it when a view becomes attached.

Also fix a bug where we could end up telling a view its visibility
changed to (INVISIBLE | GONE), which just doesn't make any sense.

Bug 20103422

Change-Id: Ifba54c36114e85cf64869afcca766c30d601a16c

9 years agoMerge "Camera2: Implement toString() for camera2 params" into mnc-dev
Chien-Yu Chen [Fri, 22 May 2015 18:15:03 +0000 (18:15 +0000)]
Merge "Camera2: Implement toString() for camera2 params" into mnc-dev

9 years agoDocs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 10:20:03 +0000 (03:20 -0700)]
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

Change-Id: I3867d70f9d669fa08cd7d533d79e02c15339d4ff

9 years agoam 6e7d2ba8: am fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs:...
Johan Euphrosine [Fri, 22 May 2015 18:10:45 +0000 (18:10 +0000)]
am 6e7d2ba8: am fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit '6e7d2ba8095c7c312013ff450dc8396135853e60':
  frameworks/base/docs: add jd files for NDK reference

9 years agoam eae90b80: am ee143ce3: docs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 18:10:40 +0000 (18:10 +0000)]
am eae90b80: am ee143ce3: docs: M Preview Program overview, update 2

* commit 'eae90b806a4a99f3c815113434d7808114db8d07':
  docs: M Preview Program overview, update 2

9 years agoMerge "Disable density scaling for HW canvas" into mnc-dev
Chris Craik [Fri, 22 May 2015 17:57:07 +0000 (17:57 +0000)]
Merge "Disable density scaling for HW canvas" into mnc-dev

9 years agoDisable density scaling for HW canvas
Chris Craik [Thu, 21 May 2015 23:46:53 +0000 (16:46 -0700)]
Disable density scaling for HW canvas

bug:20692121

Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990

9 years agoCamera2: Implement toString() for camera2 params
Chien-Yu Chen [Wed, 20 May 2015 17:16:59 +0000 (10:16 -0700)]
Camera2: Implement toString() for camera2 params

Implement toString() for BlackLevelPattern, InputConfiguration, and
StreamConfigurationMap.

Bug: 16899576
Change-Id: Ide1cf103f3282750653ce7bdc29c0b74920d4855

9 years agoMerge "sound trigger: fix wrong field type in JNI" into mnc-dev
Eric Laurent [Fri, 22 May 2015 17:36:39 +0000 (17:36 +0000)]
Merge "sound trigger: fix wrong field type in JNI" into mnc-dev

9 years agosound trigger: fix wrong field type in JNI
Eric Laurent [Fri, 22 May 2015 17:30:13 +0000 (10:30 -0700)]
sound trigger: fix wrong field type in JNI

Bug: 20951546.
Change-Id: I44f6dd05888e335a70bd212eb6f9c468a338ff92

9 years agoMerge "Use factory methods for RestrictionEntry" into mnc-dev
Fyodor Kupolov [Fri, 22 May 2015 16:21:19 +0000 (16:21 +0000)]
Merge "Use factory methods for RestrictionEntry" into mnc-dev

9 years agoMerge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev
Robert Shih [Fri, 22 May 2015 16:02:05 +0000 (16:02 +0000)]
Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev

9 years agoMerge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
Jean-Michel Trivi [Fri, 22 May 2015 15:51:34 +0000 (15:51 +0000)]
Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev

9 years agoam fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files...
Johan Euphrosine [Fri, 22 May 2015 15:37:49 +0000 (15:37 +0000)]
am fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit 'fe6d855cf3239558f780f91ded6679f54cd47661':
  frameworks/base/docs: add jd files for NDK reference

9 years agoam 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference...
Johan Euphrosine [Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)]
am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit '16580c9bb4ef4cad1f5d59402a855189decb56ba':
  frameworks/base/docs: add jd files for NDK reference

9 years agoSettingsLib: Fix wifi crash during settings index
Jason Monk [Fri, 22 May 2015 15:25:04 +0000 (11:25 -0400)]
SettingsLib: Fix wifi crash during settings index

and test it

Bug: 21365029
Change-Id: I9a914773577dcbe591b41c9114ba4d078b5e7369

9 years agoam 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp...
Johan Euphrosine [Fri, 22 May 2015 15:15:51 +0000 (15:15 +0000)]
am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit '460bcb54d58b8eec86504d2b4518267a69d5eb16':
  frameworks/base/docs: add jd files for NDK reference

9 years agoMerge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
Johan Euphrosine [Fri, 22 May 2015 14:39:33 +0000 (14:39 +0000)]
Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

9 years agoMerge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
Clara Bayarri [Fri, 22 May 2015 10:24:55 +0000 (10:24 +0000)]
Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev

9 years agoam ee143ce3: docs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 04:29:13 +0000 (04:29 +0000)]
am ee143ce3: docs: M Preview Program overview, update 2

* commit 'ee143ce3eca3db788ddff6f21a8aae6471eec5db':
  docs: M Preview Program overview, update 2

9 years agoMerge "Notify only on loss of provisioning." into mnc-dev
Erik Kline [Fri, 22 May 2015 04:22:03 +0000 (04:22 +0000)]
Merge "Notify only on loss of provisioning." into mnc-dev

9 years agodocs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 04:08:41 +0000 (21:08 -0700)]
docs: M Preview Program overview, update 2

Change-Id: If36aa779a29b9ac0a5c36e7ecf4bfe80a25d5ba4

9 years agoNotify only on loss of provisioning.
Erik Kline [Thu, 21 May 2015 07:17:12 +0000 (16:17 +0900)]
Notify only on loss of provisioning.

Lots of code refactoring, include:
    - no longer watch for on-link proxies (only routers and DNS servers)
    - keep track of NUD state of neighbors of interest

Bug: 18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397

9 years agoMerge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
Keisuke Kuroyanagi [Fri, 22 May 2015 02:28:23 +0000 (02:28 +0000)]
Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev

9 years agoMerge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev
Adam Lesinski [Fri, 22 May 2015 02:08:54 +0000 (02:08 +0000)]
Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev

9 years agoBatteryStatsService: Only query bluetooth on demand.
Adam Lesinski [Thu, 21 May 2015 22:04:18 +0000 (15:04 -0700)]
BatteryStatsService: Only query bluetooth on demand.

Bluetooth was being queried too often, leading to more power
consumption and wakelock time.

Bug:21063567
Bug:21269307
Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266

9 years agoMerge "Fix type-o in fingerprint string messages." into mnc-dev
Jim Miller [Fri, 22 May 2015 02:00:20 +0000 (02:00 +0000)]
Merge "Fix type-o in fingerprint string messages." into mnc-dev

9 years agoFix type-o in fingerprint string messages.
Jim Miller [Fri, 22 May 2015 01:59:10 +0000 (18:59 -0700)]
Fix type-o in fingerprint string messages.

Fixes bug 19561423

Change-Id: I1f7d88884d551b6b1250455cf3ff9496adf34263

9 years agoMerge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev
Vinit Deshpande [Fri, 22 May 2015 01:58:36 +0000 (01:58 +0000)]
Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev

9 years agoam 99fd373c: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionS...
Griff Hazen [Fri, 22 May 2015 01:50:57 +0000 (01:50 +0000)]
am 99fd373c: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit '99fd373cc66e0b4512b6b32c08c453501482a76e':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

9 years agoam 77420269: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam...
Griff Hazen [Fri, 22 May 2015 01:50:45 +0000 (01:50 +0000)]
am 77420269: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit '77420269fe36e693efd8e78d047a90c7d4fbb66b':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

9 years agoam 0140854a: am 85dea528: Doc change: updated images, landings, and ndk updates.
Dirk Dougherty [Fri, 22 May 2015 01:50:32 +0000 (01:50 +0000)]
am 0140854a: am 85dea528: Doc change: updated images, landings, and ndk updates.

* commit '0140854a636ed7def204d769dbc4eb7857d009be':
  Doc change: updated images, landings, and ndk updates.

9 years agoam 82120b61: am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point...
Luan Nguyen [Fri, 22 May 2015 01:49:51 +0000 (01:49 +0000)]
am 82120b61: am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples

* commit '82120b618045186f99c0c939934d1ecfc82c9caa':
  docs: Update the AlwaysOn sample link to point to DAC's samples

9 years agoam 18cc51d6: am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2
Joe Fernandez [Fri, 22 May 2015 01:49:43 +0000 (01:49 +0000)]
am 18cc51d6: am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2

* commit '18cc51d6df88f59a442bf2194efd74e1f2e07347':
  docs: M Preview downloads and SDK Setup pages v2

9 years agoam d8573aa5: am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library...
Luan Nguyen [Fri, 22 May 2015 01:49:37 +0000 (01:49 +0000)]
am d8573aa5: am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs

* commit 'd8573aa517922431dc1f50575c692b2bc1cb0307':
  docs: Refresh Wearable support library reference for Diamond

9 years agoam f644f702: am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android...
Luan Nguyen [Fri, 22 May 2015 01:49:31 +0000 (01:49 +0000)]
am f644f702: am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs

* commit 'f644f70208871d54729c74f74727e6083b27f569':
  docs: Remove references to Android Studio 0.8 beta

9 years agoam 6a4d4a46: am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear...
Luan Nguyen [Fri, 22 May 2015 01:49:25 +0000 (01:49 +0000)]
am 6a4d4a46: am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs

* commit '6a4d4a46f24389f83c1d1a837d01c76a9effd6e6':
  docs: Add Always-On lesson for Wear apps

9 years agoam 0444253e: am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable...
Luan Nguyen [Fri, 22 May 2015 01:49:19 +0000 (01:49 +0000)]
am 0444253e: am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs

* commit '0444253e6911af35db350cc6678dc2b2d020c68c':
  docs: Add always-on design for wearable activities

9 years agoam 479b1c77: am 037c9cac: Merge "Fix build." into cw-d-mr1-dev
Filip Gruszczynski [Fri, 22 May 2015 01:49:03 +0000 (01:49 +0000)]
am 479b1c77: am 037c9cac: Merge "Fix build." into cw-d-mr1-dev

* commit '479b1c77ce7b033f7160614f5a0d7305d1268129':
  Fix build.

9 years agoFix build.
Filip Gruszczynski [Thu, 21 May 2015 02:40:27 +0000 (19:40 -0700)]
Fix build.

Cherry picking because automerger is stuck.

Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
(cherry picked from commit c1b736a0cdf41ab5863bfe6901e46c95cc396342)

9 years agoMerge "Fix crash in fingerprint and problem where directory has wrong selinux label...
Jim Miller [Fri, 22 May 2015 01:42:23 +0000 (01:42 +0000)]
Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev

9 years agoRemove the 5 sec timeout logic for setVolumeControlStream
Jean-Michel Trivi [Fri, 22 May 2015 01:23:57 +0000 (18:23 -0700)]
Remove the 5 sec timeout logic for setVolumeControlStream

Bug 16983918

Change-Id: I65174615d882ea433105862b1ecc50c512979ef9

9 years agoImprove reporting to apps of transaction too large failures.
Dianne Hackborn [Tue, 19 May 2015 23:04:04 +0000 (16:04 -0700)]
Improve reporting to apps of transaction too large failures.

If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on.  Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
  it may include an additional message in it telling you how much
  data was in the parcel being sent, to help you understand why
  this happening.

- In all the framework code paths where we call to the system and
  may fail, convert these failures into a a runtime exception and
  rethrow them back to the app so that it will clearly get the
  above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128

9 years agoMerge "Add API to track usage time of apps." into mnc-dev
Dianne Hackborn [Fri, 22 May 2015 01:12:43 +0000 (01:12 +0000)]
Merge "Add API to track usage time of apps." into mnc-dev

9 years agoMerge "Clean remaining API related issues." into mnc-dev
Selim Gurun [Fri, 22 May 2015 01:02:12 +0000 (01:02 +0000)]
Merge "Clean remaining API related issues." into mnc-dev

9 years agoClean remaining API related issues.
Selim Gurun [Fri, 22 May 2015 00:24:08 +0000 (17:24 -0700)]
Clean remaining API related issues.

Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2

9 years agoFix crash in fingerprint and problem where directory has wrong selinux label
Jim Miller [Fri, 22 May 2015 00:02:21 +0000 (17:02 -0700)]
Fix crash in fingerprint and problem where directory has wrong selinux label

Fixes bug 21373942

Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7

9 years agoNo longer trigger immersive cling on panic
Adrian Roos [Fri, 22 May 2015 00:20:46 +0000 (17:20 -0700)]
No longer trigger immersive cling on panic

Instead we now request transient bars.

Bug: 19282730
Change-Id: I75de4515e2df1964de8a52d3983540f7bb5379e8

9 years agoMerge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev
Adrian Roos [Fri, 22 May 2015 00:09:11 +0000 (00:09 +0000)]
Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev

9 years agoMerge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
Filip Gruszczynski [Fri, 22 May 2015 00:02:47 +0000 (00:02 +0000)]
Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev

9 years agoMerge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev
Deepanshu Gupta [Fri, 22 May 2015 00:01:45 +0000 (00:01 +0000)]
Merge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev

9 years agoAdd API to track usage time of apps.
Dianne Hackborn [Thu, 21 May 2015 01:18:46 +0000 (18:18 -0700)]
Add API to track usage time of apps.

This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf

9 years agoMediaPlayer: add mPreparing to weed out unwanted prepared messages
Robert Shih [Thu, 21 May 2015 22:15:50 +0000 (15:15 -0700)]
MediaPlayer: add mPreparing to weed out unwanted prepared messages

Bug: 21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc

9 years agoMerge "For getHomeActivity() only return current user." into mnc-dev
Craig Mautner [Thu, 21 May 2015 23:40:26 +0000 (23:40 +0000)]
Merge "For getHomeActivity() only return current user." into mnc-dev

9 years agoThe heads up now have a margin on top and don't stick to the edge
Selim Cinek [Thu, 21 May 2015 23:14:45 +0000 (16:14 -0700)]
The heads up now have a margin on top and don't stick to the edge

Bug: 21337754
Change-Id: I199bc0732df62eadc2458db12a7c1059da988020

9 years agoFixed a crash with HUN notifications
Selim Cinek [Thu, 21 May 2015 19:11:12 +0000 (12:11 -0700)]
Fixed a crash with HUN notifications

Bug: 20925733
Change-Id: Id96c9e476d9faa770b5bcd3c35213dd0debdeaea

9 years agoRequest transient bars after panic
Adrian Roos [Thu, 21 May 2015 23:28:27 +0000 (16:28 -0700)]
Request transient bars after panic

Bug: 19282730
Change-Id: Ib621a837ba06847a02333e1786ea50e5d854c7d7

9 years agoAdd LayoutLibDelegate for new Bitmap method.
Deepanshu Gupta [Thu, 21 May 2015 23:03:24 +0000 (16:03 -0700)]
Add LayoutLibDelegate for new Bitmap method.

Original method added in: 721ae5fec5f1fd4f93aa2a361a0ac298e15ce353

Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34