OSDN Git Service

android-x86/frameworks-base.git
9 years agoStateMachine.dump produces no output sometimes.
Wink Saville [Mon, 12 Jan 2015 19:34:20 +0000 (11:34 -0800)]
StateMachine.dump produces no output sometimes.

If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137

9 years agoMerge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
Jinsuk Kim [Sat, 10 Jan 2015 21:59:37 +0000 (21:59 +0000)]
Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev

9 years agoam aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show...
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:28 +0000 (10:19 +0000)]
am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a

* commit 'aadcdef312bac520e5352d687a642a87faf3c654':

9 years agoam 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7...
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:24 +0000 (10:19 +0000)]
am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d

* commit '686160b854e845b79f74a526b397bb6dc438392b':

9 years agoam 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 autome...
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:20 +0000 (10:19 +0000)]
am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4

* commit '7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':

9 years agoam 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar...
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:04 +0000 (10:13 +0000)]
am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a

* commit '191d06b55598b653e0764638ca37d8618c9d085e':

9 years agoam 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge...
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:00 +0000 (10:13 +0000)]
am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d

* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':

9 years agoam 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4
Deepanshu Gupta [Sat, 10 Jan 2015 10:12:56 +0000 (10:12 +0000)]
am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4

* commit '38884a30dfe0fffce0c6097fd9d406e45d04aea5':

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de
Deepanshu Gupta [Sat, 10 Jan 2015 09:49:53 +0000 (09:49 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de
automerge: 8d9361a

* commit '8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':

9 years agoSupport Locale.toLanguageTag on Java 6 automerge: dbd64f7
Deepanshu Gupta [Sat, 10 Jan 2015 09:48:39 +0000 (09:48 +0000)]
Support Locale.toLanguageTag on Java 6 automerge: dbd64f7
automerge: 7da2b5d

* commit '7da2b5dbc259ef026bb075905f9fda3695dd4615':

9 years agoLayoutLib: Fix System.arraycopy() automerge: 51fb775
Deepanshu Gupta [Sat, 10 Jan 2015 09:47:08 +0000 (09:47 +0000)]
LayoutLib: Fix System.arraycopy() automerge: 51fb775
automerge: 55c7bd4

* commit '55c7bd4dac3078ab220823e522c9257246933c46':

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar.
automerge: bb600de

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.

9 years agoSupport Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge: dbd64f7

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6

9 years agoLayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()

9 years agoam c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppComp...
Deepanshu Gupta [Sat, 10 Jan 2015 04:04:22 +0000 (04:04 +0000)]
am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.

9 years agoam 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on...
Deepanshu Gupta [Sat, 10 Jan 2015 04:04:18 +0000 (04:04 +0000)]
am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit '20625cce4c13d2337456aaa74ba91b6c4379321f':
  Support Locale.toLanguageTag on Java 6

9 years agoam b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:59:58 +0000 (03:59 +0000)]
am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()

* commit 'b3d418ad027c324c1169e7087689a81bfefdf7f3':
  LayoutLib: Fix System.arraycopy()

9 years agoam ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show...
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:47 +0000 (03:56 +0000)]
am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.

9 years agoam c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:44 +0000 (03:56 +0000)]
am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6

9 years agoam db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:52:05 +0000 (03:52 +0000)]
am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()

* commit 'db703ab64643ef91bbdb989a04597ecf7d0ca928':
  LayoutLib: Fix System.arraycopy()

9 years agoam bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:05 +0000 (03:51 +0000)]
am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.

9 years agoam dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:01 +0000 (03:51 +0000)]
am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6

9 years agoam 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:43:48 +0000 (03:43 +0000)]
am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.

9 years agoam 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am 8505c387: Special case AppCompat to show action bar.

* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
  Special case AppCompat to show action bar.

9 years agoMerge "Remember to cancel lingering when a network again satsifies a NetworkRequest...
Paul Jensen [Sat, 10 Jan 2015 01:59:43 +0000 (01:59 +0000)]
Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev

9 years agoSupport Locale.toLanguageTag on Java 6
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6

Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)

9 years agoMerge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
Rachad [Sat, 10 Jan 2015 01:23:34 +0000 (01:23 +0000)]
Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev

9 years agoLayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()

Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.

Note that this was already being done for char.

Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit e1960cc0b541cda93db94de5bef42dff922b9ec3)

9 years agoSpecial case AppCompat to show action bar.
Deepanshu Gupta [Fri, 9 Jan 2015 03:10:07 +0000 (19:10 -0800)]
Special case AppCompat to show action bar.

Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b

9 years agoMerge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev
Ruben Brunk [Fri, 9 Jan 2015 23:33:46 +0000 (23:33 +0000)]
Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev

9 years agoCamera2: Fix early EOF in DngCreator#writeByteBuffer.
Ruben Brunk [Fri, 9 Jan 2015 21:48:31 +0000 (13:48 -0800)]
Camera2: Fix early EOF in DngCreator#writeByteBuffer.

Bug: 18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90

9 years agoMerge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
Christopher Tate [Fri, 9 Jan 2015 20:10:20 +0000 (20:10 +0000)]
Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev

9 years agoMerge "Guard against MountService throwing NPE." into lmp-mr1-dev
Jeff Sharkey [Fri, 9 Jan 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Guard against MountService throwing NPE." into lmp-mr1-dev

9 years agoMerge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from...
Dianne Hackborn [Fri, 9 Jan 2015 19:08:49 +0000 (19:08 +0000)]
Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev

9 years agoMerge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager...
Ariel Gertzenstein [Fri, 9 Jan 2015 17:56:10 +0000 (17:56 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev

9 years agoFix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
Dianne Hackborn [Fri, 9 Jan 2015 17:54:06 +0000 (09:54 -0800)]
Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi

FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a

9 years agoRevert "GpsLocationProvider: Read data enabled status from TelephonyManager." as...
Ariel Gertzenstein [Fri, 9 Jan 2015 17:45:40 +0000 (17:45 +0000)]
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524

This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991

9 years agoProfile owner hint in warning for extra CAs
Robin Lee [Thu, 8 Jan 2015 22:46:44 +0000 (22:46 +0000)]
Profile owner hint in warning for extra CAs

The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532

9 years agoCEC: Keep Playback device awake while it is the active source
Jinsuk Kim [Thu, 8 Jan 2015 23:55:41 +0000 (08:55 +0900)]
CEC: Keep Playback device awake while it is the active source

Alleviates the user experience issue of having to turn on the device
manually when it goes to standby mode while the device occupies
the display.

Bug: 18882764
Change-Id: I10b239a599a310e47e3c2cb98737e4b0fdb4e435

9 years agoExclude ephemeral networks from wifi backup
Christopher Tate [Thu, 8 Jan 2015 20:50:00 +0000 (12:50 -0800)]
Exclude ephemeral networks from wifi backup

We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2

9 years agoGpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Fri, 9 Jan 2015 00:04:24 +0000 (16:04 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa

9 years agoMerge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
Robin Lee [Thu, 8 Jan 2015 22:31:35 +0000 (22:31 +0000)]
Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev

9 years agoRevert "Profile owner hint in warning for extra CAs"
Robin Lee [Thu, 8 Jan 2015 22:07:41 +0000 (22:07 +0000)]
Revert "Profile owner hint in warning for extra CAs"

This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705

9 years agoGuard against MountService throwing NPE.
Jeff Sharkey [Thu, 8 Jan 2015 22:00:13 +0000 (14:00 -0800)]
Guard against MountService throwing NPE.

Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe

9 years agoMerge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
Dianne Hackborn [Thu, 8 Jan 2015 21:41:34 +0000 (21:41 +0000)]
Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev

9 years agoMerge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev
Lajos Molnar [Thu, 8 Jan 2015 20:18:59 +0000 (20:18 +0000)]
Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev

9 years agoMerge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev
Craig Mautner [Thu, 8 Jan 2015 19:09:40 +0000 (19:09 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev

9 years agoUse NULL instead of 0 when invoking CallStaticVoidMethod
Haitao Feng [Wed, 31 Dec 2014 05:48:08 +0000 (13:48 +0800)]
Use NULL instead of 0 when invoking CallStaticVoidMethod

static void CallStaticVoidMethod is variable argument function.
if pass 0 to the function like: CallStaticVoidMethod(......, 0),
0 will be treated as INT data type.but in the CallStaticVoidMethod
implement 0 will be treated as pointer data type.Pointer in 64bit
system occupied 8 bytes, but in 64bit system int occupied 4 bytes.
if call function like: CallStaticVoidMethod(......, 0),
only low 4 bytes will be assigned 0.Turned out it actually call
function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000).
intent to pass NULL to function but passed non-NULL parameter to
the function.this will cause GCDaemon crash.

Bug: 18911458
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
9 years agoMerge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 19:08:08 +0000 (19:08 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev

9 years agoRemoving DUN APN for Koodo CA (302-220)
Sanket Padawe [Thu, 8 Jan 2015 19:05:43 +0000 (11:05 -0800)]
Removing DUN APN for Koodo CA (302-220)

Bug: 18813997
Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec

9 years agoFix issue #18827122: system server crashed on broadcasting...
Dianne Hackborn [Thu, 8 Jan 2015 18:37:05 +0000 (10:37 -0800)]
Fix issue #18827122: system server crashed on broadcasting...

...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b

9 years agoRemove AppWindowTokens from exiting apps with task
Craig Mautner [Thu, 8 Jan 2015 18:56:00 +0000 (10:56 -0800)]
Remove AppWindowTokens from exiting apps with task

When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.

Fixes bug 18943737.

Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507

9 years agoMerge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
Christoph Studer [Thu, 8 Jan 2015 18:44:21 +0000 (18:44 +0000)]
Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev

9 years agoMerge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
Craig Mautner [Thu, 8 Jan 2015 18:34:00 +0000 (18:34 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Add new debug feature to track associations between processes. Also add some...
Dianne Hackborn [Thu, 8 Jan 2015 18:08:12 +0000 (18:08 +0000)]
Merge "Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs." into lmp-mr1-dev

9 years agoMerge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
Andres Morales [Thu, 8 Jan 2015 16:10:25 +0000 (16:10 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev

9 years agoFix pointer index out of range exception DO NOT MERGE
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
Fix pointer index out of range exception DO NOT MERGE

Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Fixes bug 18883936

9 years agoRemember to cancel lingering when a network again satsifies a NetworkRequest.
Paul Jensen [Thu, 8 Jan 2015 15:49:34 +0000 (10:49 -0500)]
Remember to cancel lingering when a network again satsifies a NetworkRequest.

When WiFi's score drops and then comes back up we would previously linger
WiFi but forget to cancel the linger timeout, so 30s later WiFi would
unexpectedly tear down.  This was not completely fixed in 0cc1732.

bug:18826162
Change-Id: I7bb4b99ec969099e9815f46d4c09253be71a29be

9 years agoMerge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev
Vladimir Marko [Thu, 8 Jan 2015 10:24:48 +0000 (10:24 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev

9 years agoMerge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager...
Bryce Lee [Thu, 8 Jan 2015 04:30:12 +0000 (04:30 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev

9 years agoMerge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into...
Jinsuk Kim [Thu, 8 Jan 2015 04:08:52 +0000 (04:08 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev

9 years agoCEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Wed, 7 Jan 2015 07:45:14 +0000 (16:45 +0900)]
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput

Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.

Bug: 18896770

Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea

9 years agoRevert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 02:32:08 +0000 (02:32 +0000)]
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."

This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8.

Causes NPE on devices without telephony (Android Wear for example)
Bug:18922524

Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737

9 years agoMerge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:31:54 +0000 (01:31 +0000)]
Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev

9 years agoMerge "Add missing DateFormat method." into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:31 +0000 (01:17 +0000)]
Merge "Add missing DateFormat method." into lmp-mr1-dev

9 years agoMerge "Update platform.dir search in tests." into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:22 +0000 (01:17 +0000)]
Merge "Update platform.dir search in tests." into lmp-mr1-dev

9 years agoReplace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 00:25:59 +0000 (16:25 -0800)]
Replace java.util.LinkedHashMap.eldest()

Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.

Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788

9 years agoam 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 23:53:09 +0000 (23:53 +0000)]
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.

9 years agoam d385640f: am 491a8257: docs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 23:51:33 +0000 (23:51 +0000)]
am d385640f: am 491a8257: docs: Update Dashboard for January 2015
automerge: 0e13957

* commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
  docs: Update Dashboard for January 2015

9 years agoMerge "Support single-package backup rejection by the transport" into lmp-mr1-dev
Christopher Tate [Wed, 7 Jan 2015 23:19:49 +0000 (23:19 +0000)]
Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev

9 years agoWipe FRP partition if OEM unlock enabled
Andres Morales [Wed, 7 Jan 2015 22:24:57 +0000 (14:24 -0800)]
Wipe FRP partition if OEM unlock enabled

Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.

Bug: 18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb

9 years agoAdd new debug feature to track associations between processes. Also
Dianne Hackborn [Wed, 7 Jan 2015 21:43:13 +0000 (13:43 -0800)]
Add new debug feature to track associations between processes.  Also
add some debugging for spurious service ANRs.

Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347

9 years agoAdd missing DateFormat method.
Deepanshu Gupta [Wed, 7 Jan 2015 20:26:31 +0000 (12:26 -0800)]
Add missing DateFormat method.

Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5

9 years agoUpdate platform.dir search in tests.
Deepanshu Gupta [Wed, 7 Jan 2015 20:21:59 +0000 (12:21 -0800)]
Update platform.dir search in tests.

The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.

Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c

9 years agoDon't unmute when trying to show volume UI. DO NOT MERGE
RoboErik [Wed, 7 Jan 2015 19:10:23 +0000 (11:10 -0800)]
Don't unmute when trying to show volume UI. DO NOT MERGE

When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.

bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab

9 years agoam 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:46:03 +0000 (19:46 +0000)]
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev

* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.

9 years agoMerge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Fix tests on jenkins, take 2." into lmp-dev

9 years agoFix tests on jenkins, take 2.
Deepanshu Gupta [Wed, 7 Jan 2015 19:22:22 +0000 (11:22 -0800)]
Fix tests on jenkins, take 2.

Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0

9 years agoMerge "Bring task with root activity to front when launching from recents." into...
Wale Ogunwale [Wed, 7 Jan 2015 18:02:40 +0000 (18:02 +0000)]
Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev

9 years agoMerge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation....
Ben Murdoch [Wed, 7 Jan 2015 15:50:50 +0000 (15:50 +0000)]
Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 15:24:21 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE

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

9 years agoAdd <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Ben Murdoch [Wed, 7 Jan 2015 14:20:45 +0000 (14:20 +0000)]
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.

Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa

9 years agoMerge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
Robin Lee [Wed, 7 Jan 2015 12:30:54 +0000 (12:30 +0000)]
Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

9 years agoCheck for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Tue, 6 Jan 2015 18:17:52 +0000 (18:17 +0000)]
Check for OOM in BitmapFactory's getMimeTypeString().

Bug: 18909596

(cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368)

Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3

9 years agoam 7f9582ce: am 48603a39: Fix tests on jenkins
Deepanshu Gupta [Wed, 7 Jan 2015 09:23:17 +0000 (09:23 +0000)]
am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
  Fix tests on jenkins

9 years agoam 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Andro...
Quddus Chong [Wed, 7 Jan 2015 09:23:10 +0000 (09:23 +0000)]
am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

9 years agoam decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering...
Quddus Chong [Wed, 7 Jan 2015 09:23:07 +0000 (09:23 +0000)]
am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

9 years agoam 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the...
Quddus Chong [Wed, 7 Jan 2015 09:23:02 +0000 (09:23 +0000)]
am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

9 years agoam ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
Joe Fernandez [Wed, 7 Jan 2015 09:22:58 +0000 (09:22 +0000)]
am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs

* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo

9 years agoam c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update...
Joe Fernandez [Wed, 7 Jan 2015 09:22:53 +0000 (09:22 +0000)]
am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
  docs: studio bundle checksum update

9 years agoMerge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
Joe Fernandez [Wed, 7 Jan 2015 09:14:16 +0000 (09:14 +0000)]
Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev

9 years agoam d385640f: am 491a8257: docs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:48:04 +0000 (08:48 +0000)]
am d385640f: am 491a8257: docs: Update Dashboard for January 2015

* commit 'd385640f815a820aa1fecc2c009e1d0dfbe23777':
  docs: Update Dashboard for January 2015

9 years agoam 491a8257: docs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:41:24 +0000 (08:41 +0000)]
am 491a8257: docs: Update Dashboard for January 2015

* commit '491a8257f46999d75ddc5c4c9eb599067ad380a0':
  docs: Update Dashboard for January 2015

9 years agodocs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:22:46 +0000 (00:22 -0800)]
docs: Update Dashboard for January 2015

Change-Id: I20b2b2e22199db64367d5ed99b751353c3add07b

9 years agoMerge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
Sungsoo Lim [Wed, 7 Jan 2015 07:58:15 +0000 (07:58 +0000)]
Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

9 years agoMerge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into...
Wonsik Kim [Wed, 7 Jan 2015 07:30:49 +0000 (07:30 +0000)]
Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev

9 years agoresolved conflicts for merge of ea0137ef to lmp-mr1-dev
Scott Rowe [Wed, 7 Jan 2015 03:30:11 +0000 (19:30 -0800)]
resolved conflicts for merge of ea0137ef to lmp-mr1-dev

Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214

9 years agoam 48603a39: Fix tests on jenkins
Deepanshu Gupta [Wed, 7 Jan 2015 01:43:39 +0000 (01:43 +0000)]
am 48603a39: Fix tests on jenkins

* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
  Fix tests on jenkins

9 years agoFix tests on jenkins
Deepanshu Gupta [Wed, 7 Jan 2015 01:32:26 +0000 (17:32 -0800)]
Fix tests on jenkins

When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.

Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff