OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:32 +0000 (18:03 +0000)]
am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update

9 years agoam f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:28 +0000 (18:03 +0000)]
am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update

9 years agoam f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 18:03:23 +0000 (18:03 +0000)]
am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update

9 years agoMerge "Sync file before using JournaledFile commit." into lmp-mr1-dev
Kenny Guy [Fri, 16 Jan 2015 11:21:17 +0000 (11:21 +0000)]
Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev

9 years agoCEC: Do not send <Active Source> when TV wakes up by one touch play
Jinsuk Kim [Fri, 16 Jan 2015 06:49:16 +0000 (15:49 +0900)]
CEC: Do not send <Active Source> when TV wakes up by one touch play

TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e

9 years agoCEC: Buffer Cec messages while allocating logical address
Jinsuk Kim [Fri, 16 Jan 2015 06:20:17 +0000 (15:20 +0900)]
CEC: Buffer Cec messages while allocating logical address

CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa

9 years agoam 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:15 +0000 (00:50 +0000)]
am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update

9 years agoam 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:12 +0000 (00:50 +0000)]
am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update

9 years agoam 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:08 +0000 (00:50 +0000)]
am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update

9 years agoMerge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs

9 years agoMerge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs

9 years agoMerge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 15 Jan 2015 23:39:47 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Debug for bug 18201239." into lmp-mr1-dev
Craig Mautner [Thu, 15 Jan 2015 23:18:39 +0000 (23:18 +0000)]
Merge "Debug for bug 18201239." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 15 Jan 2015 23:14:15 +0000 (15:14 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into...
Chris Craik [Thu, 15 Jan 2015 23:04:14 +0000 (23:04 +0000)]
Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

9 years agoDebug for bug 18201239.
Craig Mautner [Thu, 15 Jan 2015 22:38:39 +0000 (14:38 -0800)]
Debug for bug 18201239.

Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae

9 years agoMerge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev
Alan Viverette [Thu, 15 Jan 2015 22:25:07 +0000 (22:25 +0000)]
Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

9 years agoMerge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev
Eric Laurent [Thu, 15 Jan 2015 22:10:52 +0000 (22:10 +0000)]
Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev

9 years agoEnsure scroll assets are drawn with correct opacity
Alan Viverette [Thu, 15 Jan 2015 21:00:21 +0000 (13:00 -0800)]
Ensure scroll assets are drawn with correct opacity

Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e

9 years agoMerge "Camera: Clarify JNI exception message" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 15 Jan 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

9 years agoam d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource...
Luan Nguyen [Thu, 15 Jan 2015 19:36:35 +0000 (19:36 +0000)]
am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.

* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.

9 years agoam d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 19:30:08 +0000 (19:30 +0000)]
am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.

* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.

9 years agoMerge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev
Roozbeh Pournader [Thu, 15 Jan 2015 18:56:07 +0000 (18:56 +0000)]
Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev

9 years agoSync file before using JournaledFile commit.
Kenny Guy [Thu, 15 Jan 2015 18:14:46 +0000 (18:14 +0000)]
Sync file before using JournaledFile commit.

Ext4 doesn't guarantee that write file.new / close file.new
rename file.new to file will mean data in file.new makes it
to file atomically. The rename may happen with previous contents
of file.new and then later update to new contents
See docs for noauto_da_alloc
So rebooting the device during JournaledFile.commit may
mean we are left with an empty file.

Bug: 18590558
Change-Id: I35322c82871bed30c2c6ebbd1388338f0471f3ba

9 years agoAudioManager: make AudioPortEventHandler static
Eric Laurent [Wed, 14 Jan 2015 21:23:27 +0000 (13:23 -0800)]
AudioManager: make AudioPortEventHandler static

Make AudioPortEventHandler and audio port and patch caches
static members of AudioManager. There is only one callback
per process in AudioSystem for audio port updates
and having those non static would not work when more than
one AudioManager instance exists in one app.

Bug: 18727023.
Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872

9 years agodocs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 17:24:09 +0000 (09:24 -0800)]
docs: Remove reference to handheld app for bitmap resource locations.

bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6

9 years agoMerge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
Nicolas Prevot [Thu, 15 Jan 2015 12:28:12 +0000 (12:28 +0000)]
Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev

9 years agoMerge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev
Jinsuk Kim [Thu, 15 Jan 2015 05:07:02 +0000 (05:07 +0000)]
Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev

9 years agoMerge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
Dianne Hackborn [Thu, 15 Jan 2015 01:38:22 +0000 (01:38 +0000)]
Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev

9 years agoMerge "Vsyncs are hard" into lmp-mr1-dev
John Reck [Thu, 15 Jan 2015 01:08:56 +0000 (01:08 +0000)]
Merge "Vsyncs are hard" into lmp-mr1-dev

9 years agoMerge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev
Alan Viverette [Thu, 15 Jan 2015 01:05:53 +0000 (01:05 +0000)]
Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev

9 years agoJump ripples to end when switching to a non-hardware canvas
Alan Viverette [Thu, 15 Jan 2015 01:05:21 +0000 (17:05 -0800)]
Jump ripples to end when switching to a non-hardware canvas

Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9

9 years agoMerge "Make the DatePicker dialog fit on smaller screens in landscape mode" into...
Alan Viverette [Thu, 15 Jan 2015 00:58:38 +0000 (00:58 +0000)]
Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev

9 years agoMake the DatePicker dialog fit on smaller screens in landscape mode
Alan Viverette [Thu, 15 Jan 2015 00:58:05 +0000 (16:58 -0800)]
Make the DatePicker dialog fit on smaller screens in landscape mode

Bug: 18933437
Change-Id: Id40351d52a7eab81e15e1f0120a9da961ef21d0a

9 years agoUpdate generationId on bitmaps when decoded into by BitmapRegionDecoder
Chris Craik [Thu, 15 Jan 2015 00:52:20 +0000 (16:52 -0800)]
Update generationId on bitmaps when decoded into by BitmapRegionDecoder

bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8

9 years agoFix redundant file backups
Christopher Tate [Fri, 9 Jan 2015 02:42:33 +0000 (18:42 -0800)]
Fix redundant file backups

We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0

9 years agoFudge getRightPaddingOffset in TextView to match clipRect.
Roozbeh Pournader [Thu, 15 Jan 2015 00:01:40 +0000 (16:01 -0800)]
Fudge getRightPaddingOffset in TextView to match clipRect.

A previous change (df68999dc7de3893ca80e4c736704dcc9ed94e35) adjusted
the clipRect slightly on the right side, but didn't adjust the
padding offset used in fading.

Bug: 18820846
Change-Id: I68c0918f914742d1e7b91f9ea8d5acbd41938233

9 years agoFix issue android-app doc, bump battery stats checkin version
Dianne Hackborn [Thu, 15 Jan 2015 00:16:13 +0000 (16:16 -0800)]
Fix issue android-app doc, bump battery stats checkin version

Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a

9 years agoCEC: Support sendStandby() for MHL device
Jinsuk Kim [Wed, 14 Jan 2015 22:00:28 +0000 (07:00 +0900)]
CEC: Support sendStandby() for MHL device

Changed so that the API sendStandby() transform the request to
a MHL subcommand if the call is done against a MHL device.

Also hooked up the dump() to print out information on MHL.

Bug: 18451257
Change-Id: I1927855e0e4c45a731f0fd97ba572bfc2a894557

9 years agoMerge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not...
Stuart Scott [Wed, 14 Jan 2015 21:28:53 +0000 (21:28 +0000)]
Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

9 years agoMerge "Clean up graphics resources." into lmp-mr1-dev
Michael Wright [Wed, 14 Jan 2015 21:21:39 +0000 (21:21 +0000)]
Merge "Clean up graphics resources." into lmp-mr1-dev

9 years agoMerge "Place window at top when adding by base layer" into lmp-mr1-dev
Craig Mautner [Wed, 14 Jan 2015 20:46:22 +0000 (20:46 +0000)]
Merge "Place window at top when adding by base layer" into lmp-mr1-dev

9 years agoMerge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
Adam Lesinski [Wed, 14 Jan 2015 20:22:28 +0000 (20:22 +0000)]
Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

9 years agoPlace window at top when adding by base layer
Craig Mautner [Wed, 14 Jan 2015 20:20:35 +0000 (12:20 -0800)]
Place window at top when adding by base layer

When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.

If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.

This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.

Fixes bug 17721767.

Change-Id: I037064de7604b670841e985479eb5857b47af1d7

9 years agoUnhide getDataRoaming, Messenger uses it to decide to download MMS or not.
Stuart Scott [Wed, 14 Jan 2015 18:49:49 +0000 (10:49 -0800)]
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.

bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327

9 years agoAAPT: Handle all old unversioned attribute usage
Adam Lesinski [Tue, 13 Jan 2015 21:42:41 +0000 (13:42 -0800)]
AAPT: Handle all old unversioned attribute usage

All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62

9 years agoVsyncs are hard
John Reck [Wed, 14 Jan 2015 18:40:15 +0000 (10:40 -0800)]
Vsyncs are hard

Bug: 18866485
Change-Id: I7d304df0f20a3296956cb6887a72adba9243f117

9 years agoSysUI: Log lockscreen gestures
Christoph Studer [Mon, 22 Dec 2014 20:02:26 +0000 (21:02 +0100)]
SysUI: Log lockscreen gestures

Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac

9 years agoMerge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev
Jorim Jaggi [Wed, 14 Jan 2015 15:13:05 +0000 (15:13 +0000)]
Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev

9 years agoMerge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev
Christoph Studer [Wed, 14 Jan 2015 15:10:52 +0000 (15:10 +0000)]
Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev

9 years agoMerge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
Nicolas Prevot [Wed, 14 Jan 2015 13:33:11 +0000 (13:33 +0000)]
Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev

9 years agoMerge "Don't blindly teardown unvalidated networks when releasing NetworkRequests...
Paul Jensen [Wed, 14 Jan 2015 12:38:57 +0000 (12:38 +0000)]
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev

9 years agoMake documentation for cross-profile intent filters clearer.
Nicolas Prevot [Mon, 12 Jan 2015 12:32:56 +0000 (12:32 +0000)]
Make documentation for cross-profile intent filters clearer.

Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209

9 years agoMerge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
Lorenzo Colitti [Wed, 14 Jan 2015 10:28:23 +0000 (10:28 +0000)]
Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev

9 years agoMerge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
Wink Saville [Wed, 14 Jan 2015 00:52:06 +0000 (00:52 +0000)]
Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev

9 years agoMerge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per...
Junda Liu [Wed, 14 Jan 2015 00:06:18 +0000 (00:06 +0000)]
Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev

9 years agoSwitch the connectivity check to its own hostname.
Lorenzo Colitti [Tue, 13 Jan 2015 15:16:03 +0000 (00:16 +0900)]
Switch the connectivity check to its own hostname.

Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5

9 years agoMerge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev
Justin Harrison [Tue, 13 Jan 2015 23:01:38 +0000 (23:01 +0000)]
Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev

9 years agoMerge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev
Eric Laurent [Tue, 13 Jan 2015 23:00:38 +0000 (23:00 +0000)]
Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev

9 years agoMerge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
Stuart Scott [Tue, 13 Jan 2015 22:43:13 +0000 (22:43 +0000)]
Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev

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 "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
Fyodor Kupolov [Tue, 13 Jan 2015 22:19:23 +0000 (22:19 +0000)]
Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev

9 years agoRename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Junda Liu [Tue, 13 Jan 2015 21:50:25 +0000 (13:50 -0800)]
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.

Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897

9 years agoMerge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
Craig Mautner [Tue, 13 Jan 2015 21:28:34 +0000 (21:28 +0000)]
Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev

9 years agoMerge "Add debug for ANR" into lmp-mr1-dev
Craig Mautner [Tue, 13 Jan 2015 21:27:20 +0000 (21:27 +0000)]
Merge "Add debug for ANR" into lmp-mr1-dev

9 years agoAdd debug for ANR
Craig Mautner [Tue, 13 Jan 2015 21:09:22 +0000 (13:09 -0800)]
Add debug for ANR

Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4

9 years agoOnly notify SIM state changes when it has actually changed
Jorim Jaggi [Tue, 13 Jan 2015 20:33:45 +0000 (21:33 +0100)]
Only notify SIM state changes when it has actually changed

onSubscriptionInfoChanged gets called quite frequently whenever
something about the connectivity changes, which could lead that the
whole state of the Keyguard was reset. This change actually checks
whether the state has really changed and thus only resets Keyguard
when necessary.

Bug: 18821582
Change-Id: Ia70804d0337b11914c7d57aa4cdc47d585786f1d

9 years agoMerge "Fix for call timer resetting when starting IMS conference call. 1/4" into...
Tyler Gunn [Tue, 13 Jan 2015 20:42:36 +0000 (20:42 +0000)]
Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev

9 years agoUpdate javadoc and hide getNameSource and getDataRoaming.
Stuart Scott [Mon, 12 Jan 2015 23:13:21 +0000 (15:13 -0800)]
Update javadoc and hide getNameSource and getDataRoaming.

Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5

9 years agoAudioService: handle stream mute by stream alias
Eric Laurent [Tue, 13 Jan 2015 20:19:53 +0000 (12:19 -0800)]
AudioService: handle stream mute by stream alias

Handle stream mute/unmute requests at the stream
alias level (like is done volume changes) to be consistent.
E.g a request to mute/unmute a stream will affect all streams
sharing the same alias for volume management.

Bug: 18844550.
Change-Id: Ie2e463c58df0371589150f0ebb9b36c38b14e1be

9 years agoComplete booting when frontmost activity is idle
Craig Mautner [Tue, 13 Jan 2015 17:37:08 +0000 (09:37 -0800)]
Complete booting when frontmost activity is idle

The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.

Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.

If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.

1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.

2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.

Fixes bug 18949470.

Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520

9 years agoRun isKeyguardSecure under system privileges
Fyodor Kupolov [Tue, 13 Jan 2015 19:06:04 +0000 (11:06 -0800)]
Run isKeyguardSecure under system privileges

In certain cases, isKeyguardSecure calls UserManager.getProfileParent, which
requires MANAGE_USERS permission.
Now the check is done under system privileges.

Bug:18765066
Change-Id: I6b23aedee06403d36523af5fee9c7db9659284b3

9 years agoMerge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 19:02:06 +0000 (19:02 +0000)]
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

9 years agoMerge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
Bryce Lee [Tue, 13 Jan 2015 18:59:34 +0000 (18:59 +0000)]
Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev

9 years agoMerge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout...
Adam Powell [Tue, 13 Jan 2015 18:57:32 +0000 (18:57 +0000)]
Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev

9 years agoFix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
Nicolas Prevot [Tue, 13 Jan 2015 14:23:53 +0000 (14:23 +0000)]
Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING

BUG:18983720

Change-Id: I3af3354f746cd2981cdb8ba2ed6cc380665249ee

9 years agoMerge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting chang...
Winson Chung [Tue, 13 Jan 2015 18:16:21 +0000 (18:16 +0000)]
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev

9 years agoMerge "Clarify docs for user restrictions" into lmp-mr1-dev
Nicolas Prévot [Tue, 13 Jan 2015 17:35:12 +0000 (17:35 +0000)]
Merge "Clarify docs for user restrictions" into lmp-mr1-dev

9 years agoUpdate javadoc for DEFAULT_FEATURES deprecation.
Bryce Lee [Tue, 13 Jan 2015 17:26:46 +0000 (09:26 -0800)]
Update javadoc for DEFAULT_FEATURES deprecation.

Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c

9 years agoam 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a
Ricardo Cervera [Tue, 13 Jan 2015 16:49:57 +0000 (16:49 +0000)]
am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a

* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:42:22 +0000 (16:42 +0000)]
am f5569413: docs: Fix broken link in Common Intents
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents

9 years agoRename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 01:11:04 +0000 (17:11 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am f5569413: docs: Fix broken link in Common Intents

* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents

9 years agodocs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents

Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537

9 years agoFix unexpected language changes on SIM card insertion.
Narayan Kamath [Tue, 13 Jan 2015 15:51:57 +0000 (15:51 +0000)]
Fix unexpected language changes on SIM card insertion.

There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634

9 years agoClarify docs for user restrictions
Amith Yamasani [Thu, 8 Jan 2015 00:05:05 +0000 (16:05 -0800)]
Clarify docs for user restrictions

Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2

9 years agoDon't blindly teardown unvalidated networks when releasing NetworkRequests.
Paul Jensen [Tue, 9 Dec 2014 16:43:45 +0000 (11:43 -0500)]
Don't blindly teardown unvalidated networks when releasing NetworkRequests.

These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest.  This change unifies the
is-this-network-needed code into a single function.

bug:18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c

9 years agoDO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Winson Chung [Tue, 13 Jan 2015 01:32:24 +0000 (17:32 -0800)]
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.

Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f

9 years agoCamera: Clarify JNI exception message
Eino-Ville Talvala [Tue, 13 Jan 2015 01:01:11 +0000 (17:01 -0800)]
Camera: Clarify JNI exception message

This exception may be generated through MediaRecorder method calls
as well, so clarify that the issue is an invalid camera object.

Bug: 18414095
Change-Id: I189ab1a71ab0d6a432b87c45a82c90fe11d22ef8

9 years agoUpdate docs for Window.setElevation(), apply changes immediately
Alan Viverette [Tue, 13 Jan 2015 00:14:02 +0000 (16:14 -0800)]
Update docs for Window.setElevation(), apply changes immediately

BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8

9 years agoClean up graphics resources.
Michael Wright [Thu, 8 Jan 2015 22:30:47 +0000 (14:30 -0800)]
Clean up graphics resources.

Release SurfaceTexture after use in ColorFade and delete GL resources
in ImageWallpaper.

Bug: 17871993
Change-Id: I05bda03657ca502ba35b7187b6f361018f7ef687

9 years agoam eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces...
Ricardo Cervera [Mon, 12 Jan 2015 22:16:09 +0000 (22:16 +0000)]
am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.

9 years agoMerge "Don't allow windows with invalid types to be added." into lmp-mr1-dev
Wale Ogunwale [Mon, 12 Jan 2015 22:03:49 +0000 (22:03 +0000)]
Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev

9 years agoDon't allow windows with invalid types to be added.
Wale Ogunwale [Mon, 12 Jan 2015 18:24:36 +0000 (10:24 -0800)]
Don't allow windows with invalid types to be added.

Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df

9 years agoam a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into...
Ricardo Cervera [Mon, 12 Jan 2015 21:59:33 +0000 (21:59 +0000)]
am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.

9 years agoam d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.

9 years agoMerge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

9 years agoam 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs...
Joe Fernandez [Mon, 12 Jan 2015 21:39:24 +0000 (21:39 +0000)]
am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs

* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
  docs: Removing obsolete L-Preview docs and images

9 years agoam 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images...
Joe Fernandez [Mon, 12 Jan 2015 21:34:19 +0000 (21:34 +0000)]
am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs

* commit '661ca54706c146697fe45dfcf81840c25b9022b2':
  docs: Removing obsolete L-Preview docs and images