OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 138ab381: am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources...
Rich Slogar [Wed, 6 May 2015 01:25:22 +0000 (01:25 +0000)]
am 138ab381: am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit '138ab38141614e28a5936b3cefcfc6607ec30dcf':
  docs: providing resources link

9 years agoam e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into...
Rich Slogar [Wed, 6 May 2015 01:13:28 +0000 (01:13 +0000)]
am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b':
  docs: providing resources link

9 years agoam 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub...
Rich Slogar [Wed, 6 May 2015 00:58:49 +0000 (00:58 +0000)]
am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
  docs: providing resources link

9 years agoam d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
Rich Slogar [Wed, 6 May 2015 00:50:57 +0000 (00:50 +0000)]
am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit 'd0551feed28614dad957a09998522b25392ce621':
  docs: providing resources link

9 years agoam bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into...
John Spurlock [Wed, 6 May 2015 00:44:10 +0000 (00:44 +0000)]
am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev

* commit 'bc1a2ad8785415d1a4f86b3e477ff16e2e68f795':
  Zen: Maintain source filters for both calls and messages.

9 years agoam 57bbb8d6: Merge "Remove unused aapt target." into mnc-dev
Chih-Hung Hsieh [Wed, 6 May 2015 00:44:06 +0000 (00:44 +0000)]
am 57bbb8d6: Merge "Remove unused aapt target." into mnc-dev

* commit '57bbb8d6812bcb0813ef2530cef060e5d798033b':
  Remove unused aapt target.

9 years agoMerge "Zen: Maintain source filters for both calls and messages." into mnc-dev
John Spurlock [Wed, 6 May 2015 00:30:24 +0000 (00:30 +0000)]
Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev

9 years agoMerge "Remove unused aapt target." into mnc-dev
Chih-Hung Hsieh [Wed, 6 May 2015 00:29:23 +0000 (00:29 +0000)]
Merge "Remove unused aapt target." into mnc-dev

9 years agoam 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev
Amith Yamasani [Wed, 6 May 2015 00:29:11 +0000 (00:29 +0000)]
am 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev

* commit '19343927c2cce0b8dfdd1df8309ce82c3d39b0d5':
  Permission policies are for profile and device owners

9 years agoMerge "Permission policies are for profile and device owners" into mnc-dev
Amith Yamasani [Wed, 6 May 2015 00:18:18 +0000 (00:18 +0000)]
Merge "Permission policies are for profile and device owners" into mnc-dev

9 years agoPermission policies are for profile and device owners
Amith Yamasani [Wed, 6 May 2015 00:16:18 +0000 (17:16 -0700)]
Permission policies are for profile and device owners

Not just device owners

Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f

9 years agoRemove unused aapt target.
Chih-Hung Hsieh [Mon, 4 May 2015 21:10:13 +0000 (14:10 -0700)]
Remove unused aapt target.

BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)

9 years agoam afa81ed0: am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScrip...
Jean-Luc Brouillet [Wed, 6 May 2015 00:06:25 +0000 (00:06 +0000)]
am afa81ed0: am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit 'afa81ed0b174eb6b81b811fac5cd5df2edb0f798':
  docs: Overhaul of the RenderScript reference documentation.

9 years agoam 6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
Selim Cinek [Wed, 6 May 2015 00:06:21 +0000 (00:06 +0000)]
am 6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev

* commit '6da881ba7d6b2b860770aabcb0daefcde85ece20':
  Fixed a measuring bug when the panel was collapsed

9 years agoam 1e139e86: Merge "Enforcing the touchslop now when flinging open before interceptin...
Selim Cinek [Wed, 6 May 2015 00:06:17 +0000 (00:06 +0000)]
am 1e139e86: Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev

* commit '1e139e86843b59839f9eb6f88466d152b7e23c03':
  Enforcing the touchslop now when flinging open before intercepting

9 years agoam 1690ec8e: Merge "Fixed a bug where the notifications would jump when going to...
Selim Cinek [Wed, 6 May 2015 00:06:13 +0000 (00:06 +0000)]
am 1690ec8e: Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev

* commit '1690ec8e72876459da198a7228c6591df321df64':
  Fixed a bug where the notifications would jump when going to the full shade

9 years agoam e9194b98: Merge "Extended test to support launching assist above lock screen"...
Selim Cinek [Wed, 6 May 2015 00:06:08 +0000 (00:06 +0000)]
am e9194b98: Merge "Extended test to support launching assist above lock screen" into mnc-dev

* commit 'e9194b98a2098a1d94957e4723eaaf7399ecf3be':
  Extended test to support launching assist above lock screen

9 years agoam 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into...
Selim Cinek [Wed, 6 May 2015 00:06:04 +0000 (00:06 +0000)]
am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev

* commit '6329bbceebc8c0d6de164cb693a828402542fd35':
  The voice assist may now be launched above the lockscreen

9 years agoam 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference...
Jean-Luc Brouillet [Tue, 5 May 2015 23:58:55 +0000 (23:58 +0000)]
am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit '79f12bb648aa8a4f71e2c64c5c6354e2261e3257':
  docs: Overhaul of the RenderScript reference documentation.

9 years agoMerge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:54:57 +0000 (23:54 +0000)]
Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev

9 years agoMerge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:54:21 +0000 (23:54 +0000)]
Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev

9 years agoMerge "Fixed a bug where the notifications would jump when going to the full shade...
Selim Cinek [Tue, 5 May 2015 23:53:58 +0000 (23:53 +0000)]
Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev

9 years agoMerge "Extended test to support launching assist above lock screen" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:53:22 +0000 (23:53 +0000)]
Merge "Extended test to support launching assist above lock screen" into mnc-dev

9 years agoMerge "The voice assist may now be launched above the lockscreen" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:52:34 +0000 (23:52 +0000)]
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev

9 years agoMerge "docs: providing resources link" into lmp-mr1-ub-docs
Rich Slogar [Tue, 5 May 2015 23:44:33 +0000 (23:44 +0000)]
Merge "docs: providing resources link" into lmp-mr1-ub-docs

9 years agoam d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
Jean-Luc Brouillet [Tue, 5 May 2015 23:39:28 +0000 (23:39 +0000)]
am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit 'd967fcbee77b2872cb5ae6b05aaabbbc764f806b':
  docs: Overhaul of the RenderScript reference documentation.

9 years agoam 9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev
Etan Cohen [Tue, 5 May 2015 23:38:40 +0000 (23:38 +0000)]
am 9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev

* commit '9c7ce8b0fc8e429e2524b346174cb67b59c7e175':
  Disable VT over IMS feature.

9 years agoMerge "Disable VT over IMS feature." into mnc-dev
Etan Cohen [Tue, 5 May 2015 23:30:27 +0000 (23:30 +0000)]
Merge "Disable VT over IMS feature." into mnc-dev

9 years agoam e9f17cda: docs: Overhaul of the RenderScript reference documentation.
Jean-Luc Brouillet [Tue, 5 May 2015 23:27:04 +0000 (23:27 +0000)]
am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit 'e9f17cda80ae60818f43b4ed724436c8b88fd0db':
  docs: Overhaul of the RenderScript reference documentation.

9 years agoam 915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev
Jae Seo [Tue, 5 May 2015 23:21:02 +0000 (23:21 +0000)]
am 915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev

* commit '915389d4b8626cb35bd752420da5d21ec98c209a':
  TIF: Make all the parameters for UNRATED null

9 years agoMerge "TIF: Make all the parameters for UNRATED null" into mnc-dev
Jae Seo [Tue, 5 May 2015 23:13:20 +0000 (23:13 +0000)]
Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev

9 years agoTIF: Make all the parameters for UNRATED null
Jae Seo [Tue, 5 May 2015 20:18:17 +0000 (13:18 -0700)]
TIF: Make all the parameters for UNRATED null

UNRATED is equivalent to Java null in its meaning and usage, thus it is
not appropriate to use non-trivial strings such as "com.android.tv" and
"UNRATED" to create this constant. Replaced them with the string "null",
which is commonly used in other parts of Android and also modified the
documentation to clarify its usage.

Bug: 19102311
Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13

9 years agoZen: Maintain source filters for both calls and messages.
John Spurlock [Tue, 5 May 2015 22:30:28 +0000 (18:30 -0400)]
Zen: Maintain source filters for both calls and messages.

Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22

9 years agodocs: Overhaul of the RenderScript reference documentation.
Jean-Luc Brouillet [Fri, 24 Apr 2015 22:59:02 +0000 (15:59 -0700)]
docs: Overhaul of the RenderScript reference documentation.

cherry-pick from CL: https://android-review.googlesource.com/148241

This CL replaces the Doxygen generated documentation by one that's created
by our internal tool found in framework/rs/api.  The big advantages:

- Can handle overloaded functions.  Doxygen could not and RenderScript has many.
- Can have version information.
- Can match the look of the Java documentation.
- Cleaner look and no leaking of internal paths.

This CL also include changes introduced by the L release which was missing
previously.

Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f

9 years agoDisable VT over IMS feature.
Etan Cohen [Tue, 5 May 2015 22:18:07 +0000 (15:18 -0700)]
Disable VT over IMS feature.

Feature code (mostly) implemented but not final or supported in release.

Change-Id: I65c4d4400a814718c51954299ef7c993a37638e2

9 years agoam e74007de: Merge "Clean up error handling in CopyService." into mnc-dev
Ben Kwa [Tue, 5 May 2015 21:56:08 +0000 (21:56 +0000)]
am e74007de: Merge "Clean up error handling in CopyService." into mnc-dev

* commit 'e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
  Clean up error handling in CopyService.

9 years agoam 570de1e0: Make sure fingerprint error messages are handled in Keyguard
Jorim Jaggi [Tue, 5 May 2015 21:56:03 +0000 (21:56 +0000)]
am 570de1e0: Make sure fingerprint error messages are handled in Keyguard

* commit '570de1e0e903f11ab74b0fd386b17494cd66ff33':
  Make sure fingerprint error messages are handled in Keyguard

9 years agoMerge "Clean up error handling in CopyService." into mnc-dev
Ben Kwa [Tue, 5 May 2015 21:53:21 +0000 (21:53 +0000)]
Merge "Clean up error handling in CopyService." into mnc-dev

9 years agoFixed a measuring bug when the panel was collapsed
Selim Cinek [Tue, 5 May 2015 03:46:25 +0000 (20:46 -0700)]
Fixed a measuring bug when the panel was collapsed

This lead to the dismissView and other views being measured with
height 0 and therefore harm performance and animations.

Bug: 20665047
Change-Id: I985c40948994b409cea5ac7c34a711ce243c62f1

9 years agoEnforcing the touchslop now when flinging open before intercepting
Selim Cinek [Wed, 29 Apr 2015 22:36:56 +0000 (15:36 -0700)]
Enforcing the touchslop now when flinging open before intercepting

This could lead to clicks on notifications not being recognized when opening.
Bug: 19228079
Change-Id: I02c856dd885c8e9bb228a5b20e975e27dba60d12

9 years agoFixed a bug where the notifications would jump when going to the full shade
Selim Cinek [Wed, 29 Apr 2015 02:17:32 +0000 (19:17 -0700)]
Fixed a bug where the notifications would jump when going to the full shade

Change-Id: I811f3cd543f0e69d06bfe692435c579b7844173e

9 years agoExtended test to support launching assist above lock screen
Selim Cinek [Mon, 27 Apr 2015 23:18:37 +0000 (16:18 -0700)]
Extended test to support launching assist above lock screen

Change-Id: Ic65e638eed214a240cc13666f857e9b297f28168

9 years agoThe voice assist may now be launched above the lockscreen
Selim Cinek [Fri, 24 Apr 2015 23:46:13 +0000 (16:46 -0700)]
The voice assist may now be launched above the lockscreen

A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead

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 agoam 356b1777: Merge "Cleanup properties" into mnc-dev
Chris Craik [Tue, 5 May 2015 21:43:19 +0000 (21:43 +0000)]
am 356b1777: Merge "Cleanup properties" into mnc-dev

* commit '356b1777092e7da3ac5eae0bc94bd21e1cf9319a':
  Cleanup properties

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 agoam d6abbd29: Merge "Dump profile info after running test" into mnc-dev
John Reck [Tue, 5 May 2015 21:18:17 +0000 (21:18 +0000)]
am d6abbd29: Merge "Dump profile info after running test" into mnc-dev

* commit 'd6abbd29b7f453397036cf602655534bbd6c0430':
  Dump profile info after running test

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

* commit 'b2e3b74418f7fc09f2610bc5620e748d420b5f87':
  WiFi Calling: Show different operator name string in Data usage dialog.

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

* commit '2b0eaffc6264abb4162c089adf7089b4cfee5719':
  Hide lockscreen contents from a11y while bouncer is showing

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 agoam 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
Jorim Jaggi [Tue, 5 May 2015 20:52:28 +0000 (20:52 +0000)]
am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev

* commit '5be4d295c08614eaf8afd012f90e5c7726bc293e':
  Only enable fingerprint auth after first regular auth

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

* commit 'd5304020b29762ce79d66c1ed3028b0ee30c68ad':
  Volume A11y: Prevent auto-dismiss when feedback enabled.

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 agoam 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev
Hiroshi Yamauchi [Tue, 5 May 2015 20:42:04 +0000 (20:42 +0000)]
am 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev

* commit '95e6c78f3f71850931f69fc562f68e0c46430981':
  Fix binder force gc will block binder thread

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 agoam 5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev
Prabhakar Thirumoorthy [Tue, 5 May 2015 20:18:02 +0000 (20:18 +0000)]
am 5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev

* commit '5b402fd8963e4700973597650b6992444ff8ffdd':
  Update permissions on memory usage instrumentation

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 agoam efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from...
Ben Kwa [Tue, 5 May 2015 19:01:27 +0000 (19:01 +0000)]
am efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from   DO NOT MERGE" into mnc-dev

* commit 'efb70fd8a0a37ddd08356120fb63ff62694eaea0':
  Cherry pick beefed-up error handling in the CopyService from master.  DO NOT MERGE

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 agoClean up error handling in CopyService.
Ben Kwa [Tue, 5 May 2015 18:58:38 +0000 (11:58 -0700)]
Clean up error handling in CopyService.

Change-Id: I87b9f2c2cfddc222fbee64578b0a1349508a244f

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 agoam d5fb9cac: am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge...
Andrew Solovay [Tue, 5 May 2015 18:47:46 +0000 (18:47 +0000)]
am d5fb9cac: am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'd5fb9cac87d65d59e9d2c0fa4242fb6eeb4edf6d':

9 years agoam 34265cd9: media: Added MPEG2 profile/levels and tests
Harish Mahendrakar [Tue, 5 May 2015 18:47:41 +0000 (18:47 +0000)]
am 34265cd9: media: Added MPEG2 profile/levels and tests

* commit '34265cd94f76cc18648c310e4f120d280bf3a0a4':
  media: Added MPEG2 profile/levels and tests

9 years agoam def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted"...
Tony Mantler [Tue, 5 May 2015 18:47:35 +0000 (18:47 +0000)]
am def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted" into mnc-dev

* commit 'def4c0c49aeebccbb42d9b82901a7de81782baad':
  Don't crash in StorageMeasurement if volume isn't mounted

9 years agoam 102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev
Yang Ni [Tue, 5 May 2015 18:47:26 +0000 (18:47 +0000)]
am 102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev

* commit '102badf834256e209e1a5f58fde1d67b8fd5ac0b':
  Sanity checks in JNI code for closure creation

9 years agoam be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
Raph Levien [Tue, 5 May 2015 18:47:21 +0000 (18:47 +0000)]
am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev

* commit 'be8db119726a229ca687b99fcdb8a6a959648cd1':
  Fix NPE in Html.inParagraph()

9 years agoam 9e540a51: Merge "Fixing docs." into mnc-dev
Julia Reynolds [Tue, 5 May 2015 18:47:07 +0000 (18:47 +0000)]
am 9e540a51: Merge "Fixing docs." into mnc-dev

* commit '9e540a512281560a9b4ffc0edbe68cddaf9bc3b4':
  Fixing docs.

9 years agoam 1542179b: Merge "Add hidden methods to set/get default dialer across users" into...
Yorke Lee [Tue, 5 May 2015 18:47:00 +0000 (18:47 +0000)]
am 1542179b: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit '1542179bd2bc82db31a925550b47151cf579c767':
  Add hidden methods to set/get default dialer across users

9 years agoam fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev
John Reck [Tue, 5 May 2015 18:46:56 +0000 (18:46 +0000)]
am fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev

* commit 'fe2f7e31be01c8c0ebcbdfb1ff8ae420f24c0ac2':
  Add some basic DA unit tests

9 years agoam 424681e4: Settings UI for SIM access profile (2/2)
Casper Bonde [Tue, 5 May 2015 18:46:48 +0000 (18:46 +0000)]
am 424681e4: Settings UI for SIM access profile (2/2)

* commit '424681e43e454bfcbceb863ddccb875ea57ec26f':
  Settings UI for SIM access profile (2/2)

9 years agoam 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme...
Alan Viverette [Tue, 5 May 2015 18:46:36 +0000 (18:46 +0000)]
am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev

* commit '261208e002775fe9a9f4e79e9f70b41852cfbe60':
  Add API for obtaining changing configurations bitmask from Theme

9 years agoam 28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
Jean-Michel Trivi [Tue, 5 May 2015 18:46:22 +0000 (18:46 +0000)]
am 28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev

* commit '28a516280a59a81aeecbf4a68057019d59feb872':
  AudioRecord JNI: use default UID / PID

9 years agoam 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
Todd Kennedy [Tue, 5 May 2015 18:46:11 +0000 (18:46 +0000)]
am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev

* commit '3266f60ba0c2a37883446cadbfc00bb8354824d0':
  Call Activity#onAttachFragment()

9 years agoam e02b7868: Merge "Call profile changed in cases were focused activity is nulled...
Kenny Guy [Tue, 5 May 2015 18:46:06 +0000 (18:46 +0000)]
am e02b7868: Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev

* commit 'e02b7868c6c8f856a21f36569a77dab7f1cc7c78':
  Call profile changed in cases were focused activity is nulled.

9 years agoam 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
Svet Ganov [Tue, 5 May 2015 18:46:01 +0000 (18:46 +0000)]
am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev

* commit '4a64b19f239b6bff82a032329ce5781681843044':
  Permission UI - legacy apps support

9 years agoam c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev
John Reck [Tue, 5 May 2015 18:45:52 +0000 (18:45 +0000)]
am c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev

* commit 'c64b3fab95cff6f33cba524f1b9c540cfb75c73b':
  Attempt to solve the double-GC problem

9 years agoam 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
John Spurlock [Tue, 5 May 2015 18:45:48 +0000 (18:45 +0000)]
am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev

* commit '0bc8afff7eb3b5af72b7e9a4ce3954488bfbecd0':
  Zen: Remove calendar rule attendance attribute.

9 years agoam d4474cb9: Remove dead code from IMMS.
Seigo Nonaka [Tue, 5 May 2015 18:45:36 +0000 (18:45 +0000)]
am d4474cb9: Remove dead code from IMMS.

* commit 'd4474cb9454c7a8b907c0be07236ffed4ecf3fd8':
  Remove dead code from IMMS.

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

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

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

* commit '703b5f895d8be08d795ace72c74576e1e4b6c5b6':
  docs: Update Eclipse migrate procedure

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

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

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 agoMerge commit 'd1808401' into manualmerge
Prerepa Viswanadham [Tue, 5 May 2015 17:39:24 +0000 (10:39 -0700)]
Merge commit 'd1808401' into manualmerge

Change-Id: Ie15d0b8eb2c03ecabf3002635bf1130c7050f07d

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