OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Chris Tate [Thu, 21 Apr 2016 01:12:06 +0000 (01:12 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:11:38 +0000 (01:11 +0000)]
Merge "PIP: Support accessibility" into nyc-dev

8 years agoOnly invoke k/v helpers during k/v operations
Christopher Tate [Tue, 12 Apr 2016 19:36:47 +0000 (12:36 -0700)]
Only invoke k/v helpers during k/v operations

In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.

Bug 28132784

Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:54:31 +0000 (00:54 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev
Tim Murray [Thu, 21 Apr 2016 00:32:45 +0000 (00:32 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:25:14 +0000 (00:25 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev

8 years agoMerge "Disallow changing stacks if top activity" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:11:49 +0000 (00:11 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev

8 years agoMerge "Add JavaDoc for View.updateDragShadow" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:02:06 +0000 (00:02 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev

8 years agoMerge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
Rob Carr [Thu, 21 Apr 2016 00:00:06 +0000 (00:00 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev

8 years agoMerge "Removing disk access from startActivity thread" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev

8 years agoMerge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
Eino-Ville Talvala [Wed, 20 Apr 2016 23:55:09 +0000 (23:55 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev

8 years agoFix logspam by JobInfo
Shreyas Basarge [Wed, 20 Apr 2016 23:44:58 +0000 (00:44 +0100)]
Fix logspam by JobInfo

Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93

8 years agoMerge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev

8 years agoExclude IME dialogs from tap outside task bounds funcationality
Wale Ogunwale [Wed, 20 Apr 2016 23:33:36 +0000 (16:33 -0700)]
Exclude IME dialogs from tap outside task bounds funcationality

We don't want tapping on these windows to cause a change in app
focus.

Bug: 28184155
Change-Id: Ibd4ca15b2154c2e83a11f4a2a3edb4356cbfbfed

8 years agoMerge "Set BugreportProgressService to run on foreground." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev

8 years agoA11y: Fix battery icon and clock descriptions
Adrian Roos [Wed, 20 Apr 2016 22:51:42 +0000 (15:51 -0700)]
A11y: Fix battery icon and clock descriptions

Now announces charging state on the battery icon
and AM/PM on the clock.

Change-Id: Ib8d249e60b555834e5e224287ea332178ce7c165
Fixes: 27552350

8 years agoMerge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:46:04 +0000 (22:46 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev

8 years agoDisallow changing stacks if top activity
Jorim Jaggi [Wed, 20 Apr 2016 03:30:47 +0000 (20:30 -0700)]
Disallow changing stacks if top activity

When we attach an activity to an existing
task, and that task is already on top,
disallow changing stacks altogether even
if launch stack id is set.

Bug: 28026847
Change-Id: Ie70f0585a29dc1b85a5093624fede32110be3c76

8 years agoRemoving disk access from startActivity thread
Suprabh Shukla [Wed, 20 Apr 2016 22:24:31 +0000 (15:24 -0700)]
Removing disk access from startActivity thread

Code was checking whether the directory for recent_images existed in
many places unnecessarily causing StrictMode violations. Moved the
code to only attempt to check and create the directory before
actually writing to disk.

Bug: b/28195831
Change-Id: I05f77a10f1dafc8cc0b1836b62352d56549ac1ee

8 years agoMerge "Added defensive code to prevent system crash" into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev

8 years agoMerge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 22:19:04 +0000 (22:19 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev

8 years agoMerge "Don't back up wallpapers that we've been told not to" into nyc-dev
Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "Don't back up wallpapers that we've been told not to" into nyc-dev

8 years agoresolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c
Christopher Tate [Wed, 20 Apr 2016 22:09:28 +0000 (22:09 +0000)]
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c
am: b965ced  -s ours

* commit 'b965ced011bdd7a3ec5450f93d1c58b889514f11':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58

8 years agoCamera2: Ignore exception on double-completed capture sequences.
Eino-Ville Talvala [Wed, 20 Apr 2016 22:05:40 +0000 (15:05 -0700)]
Camera2: Ignore exception on double-completed capture sequences.

As a workaround for b/27870771, convert fatal exception into a
warning.

Duplicate calls to finishPendingSequence with the same sequenceId
are seen in user crash reports, but with no further context and
inability to reproduce after testing various hypothesis, just
warn about it happening.

Bug: 27870771
Change-Id: Icd7d408887e04b94092689ce61809d6c664d8e3a

8 years agoresolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7
Christopher Tate [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7
am: 343600c

* commit '343600c3ecff31826e50d40821927e446adb9b0a':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a

8 years agoSet BugreportProgressService to run on foreground.
Felipe Leme [Fri, 15 Apr 2016 19:49:34 +0000 (12:49 -0700)]
Set BugreportProgressService to run on foreground.

BugreportProgressService do not persist the user-provided
information (like details and screenshot paths), so if it's killed by
the framework, that info is lost.

Running it as foreground mitigates the changes of it being killed.

BUG: 27431998
BUG: 28291423
Change-Id: I2f58507beb38309628f2f19d3f7f950d07eca16f

8 years agoresolve merge conflicts of 44e07e0 to mnc-dev am: 825b713
Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713
am: 8c635e7

* commit '8c635e73c698302ce6661f227c274164972f048e':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3

8 years agoBatteryStatsHelper: Include screen on baseline power draw
Adam Lesinski [Wed, 20 Apr 2016 20:04:59 +0000 (13:04 -0700)]
BatteryStatsHelper: Include screen on baseline power draw

Calculate the baseline power usage for the device when it is in suspend and idle.
The device is drawing POWER_CPU_IDLE power at its lowest power state.
The device is drawing POWER_CPU_IDLE + POWER_CPU_AWAKE power when a wakelock is held.
The device is drawing POWER_CPU_IDLE + POWER_CPU_AWAKE + POWER_SCREEN_ON when the screen is on.

Bug:27533512
Change-Id: Idcb587390bc8159fcbd6625cca4cb1aca19976d6

8 years agoAdd JavaDoc for View.updateDragShadow
Vladislav Kaznacheev [Wed, 20 Apr 2016 21:40:32 +0000 (14:40 -0700)]
Add JavaDoc for View.updateDragShadow

Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7

8 years agoMerge "Do not prematurely update position while bounds animating." into nyc-dev
Rob Carr [Wed, 20 Apr 2016 21:37:10 +0000 (21:37 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev

8 years agoresolve merge conflicts of 44e07e0 to mnc-dev
Christopher Tate [Wed, 20 Apr 2016 21:35:50 +0000 (21:35 +0000)]
resolve merge conflicts of 44e07e0 to mnc-dev
am: 825b713

* commit '825b7134699fbaaa16423c52b7b424d4a9afefb1':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2

8 years agoDon't back up wallpapers that we've been told not to
Christopher Tate [Thu, 25 Feb 2016 20:43:38 +0000 (12:43 -0800)]
Don't back up wallpapers that we've been told not to

In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d

8 years agoMerge "Fix bug where fingerprint for wrong userId was attempted to be removed." into...
Jim Miller [Wed, 20 Apr 2016 21:33:13 +0000 (21:33 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev

8 years agoMerge "MidiDevice: do not open ports on closed device" into nyc-dev
Phil Burk [Wed, 20 Apr 2016 21:15:32 +0000 (21:15 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev

8 years agoMerge "Test coverage for new FBE functionality" into nyc-dev
Fyodor Kupolov [Wed, 20 Apr 2016 21:13:39 +0000 (21:13 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev

8 years agoMerge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev

8 years agoFix inline reply clobbering when narrowly missing send button
Adrian Roos [Wed, 20 Apr 2016 20:58:03 +0000 (13:58 -0700)]
Fix inline reply clobbering when narrowly missing send button

The RemoteInputView leaked through unhandled touches. To prevent this,
we now make sure the send button covers the entire area, and we catch
any touches that did not go to either the send button or the text box.

Bug: 27357771
Change-Id: Idc08d98dc7970b99c735f80088ea1eec0ec2d831

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
Shubham Ajmera [Wed, 20 Apr 2016 20:52:56 +0000 (20:52 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev

8 years agoMerge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
Chong Zhang [Wed, 20 Apr 2016 20:52:07 +0000 (20:52 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev

8 years agoRevert "PowerManager: Adds the Sustained performance API."
Ruchi Kandoi [Wed, 20 Apr 2016 20:42:01 +0000 (13:42 -0700)]
Revert "PowerManager: Adds the Sustained performance API."

This reverts commit 0abc001275d6cf0af4990f521ccff7346a7cd2bf.

Bug: 28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
8 years agoPrint API for N: Fix docs and change interfaces as requested.
Philip P. Moltmann [Wed, 20 Apr 2016 20:21:34 +0000 (13:21 -0700)]
Print API for N: Fix docs and change interfaces as requested.

Fixes: 28291443
Change-Id: I1a1585796032351a739d54171bd67ccc76f0f08a

8 years agoResourcesManager: Throw exception if failed to load asset path
Adam Lesinski [Wed, 20 Apr 2016 20:36:19 +0000 (13:36 -0700)]
ResourcesManager: Throw exception if failed to load asset path

Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.

Throw a proper exception instead, detailing which path failed to load.

Bug:28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec

8 years agoMerge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 20:35:20 +0000 (20:35 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev

8 years agoFix bug where fingerprint for wrong userId was attempted to be removed.
Jim Miller [Wed, 20 Apr 2016 20:34:11 +0000 (13:34 -0700)]
Fix bug where fingerprint for wrong userId was attempted to be removed.

- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d

8 years agoresolve merge conflicts of 44e07e0 to mnc-dev
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of 44e07e0 to mnc-dev

Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47

8 years agoPrevent recents from closing while moving PiP to fullscreen.
Robert Carr [Wed, 20 Apr 2016 19:53:16 +0000 (12:53 -0700)]
Prevent recents from closing while moving PiP to fullscreen.

If we close recents when beginning the animation, we will
trigger a resume of the previous fullscreen app, which will
attempt to aniamte in at the same time we are animating
the PiP to fullscreen. These conflict causing flicker and
churn.

Bug: 27793381
Change-Id: I520181dadab938bbf62b25891f5ba0e4e9783967

8 years agoMerge "Add settings for altering VR display behavior." into nyc-dev
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev

8 years agoMidiDevice: do not open ports on closed device
Phil Burk [Tue, 19 Apr 2016 22:56:24 +0000 (15:56 -0700)]
MidiDevice: do not open ports on closed device

Fix involves client side mIsDeviceClosed flag.

Bug: 24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "Add support for multiple callback registration in." into nyc-dev
Daniel Estrada Alva [Wed, 20 Apr 2016 19:22:08 +0000 (19:22 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev

8 years agoAdded defensive code to prevent system crash
Lifu Tang [Wed, 20 Apr 2016 19:14:07 +0000 (12:14 -0700)]
Added defensive code to prevent system crash

Bug: 26940611
Change-Id: I8226d1acb42ccc7d2cd910e30b47c7c63c9f490b

8 years agoMerge "TIF: Do not build input list for background user" into nyc-dev
Dongwon Kang [Wed, 20 Apr 2016 19:19:33 +0000 (19:19 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev

8 years agoMerge "Align radio buttons with app icon, change text color." into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:10:11 +0000 (19:10 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev

8 years agoMerge "Animate volume dialog expansion/contraction." into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:07:12 +0000 (19:07 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev

8 years agoDo not prematurely update position while bounds animating.
Robert Carr [Mon, 18 Apr 2016 18:52:21 +0000 (11:52 -0700)]
Do not prematurely update position while bounds animating.

We intend to update the task size in onAnimationStart
so that we can get a new buffer as quickly as possible.
We need to keep it at the old position though, or
we will see a jump at the beginning of the animation.

Bug: 28091556
Change-Id: I5fc5f9eef1629dea88844cf3f2274eaa48909b97

8 years agoAlign radio buttons with app icon, change text color.
Julia Reynolds [Wed, 20 Apr 2016 15:42:04 +0000 (11:42 -0400)]
Align radio buttons with app icon, change text color.

Bug: 27597108
Change-Id: Id821b46b6f2898295ae711ec33f56fed1b529584

8 years agoMerge "Only try to add details to zip once." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 19:03:01 +0000 (19:03 +0000)]
Merge "Only try to add details to zip once." into nyc-dev

8 years agoUpdate scan and last network info in the WorkThread am: cf0875a am: c441faa
Mitchell Wills [Wed, 20 Apr 2016 19:01:51 +0000 (19:01 +0000)]
Update scan and last network info in the WorkThread am: cf0875a am: c441faa
am: 2dbac6c

* commit '2dbac6cee58c343682ebf6590ae170c2acd067e4':
  Update scan and last network info in the WorkThread

Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26

8 years agoAnimate volume dialog expansion/contraction.
Julia Reynolds [Wed, 20 Apr 2016 18:37:39 +0000 (14:37 -0400)]
Animate volume dialog expansion/contraction.

Bug: 28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95

8 years agoMerge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
Andreas Gampe [Wed, 20 Apr 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev

8 years agoUpdate scan and last network info in the WorkThread am: cf0875a
Mitchell Wills [Wed, 20 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Update scan and last network info in the WorkThread am: cf0875a
am: c441faa

* commit 'c441faa6de5618e9da029858ce83b3e129be2974':
  Update scan and last network info in the WorkThread

Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba

8 years agoFix IME adjust when stack focus changes while IME is visible
Chong Zhang [Tue, 19 Apr 2016 04:02:01 +0000 (21:02 -0700)]
Fix IME adjust when stack focus changes while IME is visible

- Use two values to animate divider width adjustment separately
  from stack position adjustment. For example IME is visible
  with focus on bottom stack, then user clicks top stack. In this
  case bottom stack position should go back to unadjusted, but
  divider should remain thinner.

- If we need to start a new animation during an existing animation,
  start the motion from where the existing animation left off, so
  that it doesn't look discontinuous.

- Do not adjust if IME is not actually focused on any stack. This
  could happen when swiping down the status bar.

bug: 28175599
Change-Id: I802def5d1c13ebe11094eb28fc5a0b0c309e4d76

8 years agoPrevent printing from finishing activity.
Philip P. Moltmann [Wed, 20 Apr 2016 18:53:57 +0000 (11:53 -0700)]
Prevent printing from finishing activity.

Bug: 27861927
Change-Id: I00177ca0ec75cc8f7fd422907a2b5827b5db406b

8 years agoUpdate scan and last network info in the WorkThread
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am: cf0875a

* commit 'cf0875a9b69da9da5e16563eca33609e775d9195':
  Update scan and last network info in the WorkThread

Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38

8 years agoFixed bug in upgrading GpsMeasurement
Lifu Tang [Wed, 20 Apr 2016 18:48:16 +0000 (11:48 -0700)]
Fixed bug in upgrading GpsMeasurement

Bug: 28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a

8 years agoresolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev
Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]
resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev

Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71

8 years agoMerge changes from topic 'merge_docs_nyc-dev' into nyc-dev
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

8 years agoMerge "When restacking IM windows preserve relative order." into nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:40 +0000 (18:30 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev

8 years agoMerge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev

8 years agoMerge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
Yi Kong [Wed, 20 Apr 2016 18:04:45 +0000 (18:04 +0000)]
Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev

8 years agoMerge "Add restrictedSwitchSummary attribute to restricted switch preferences." into...
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev

8 years agoMerge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into...
Jae Seo [Wed, 20 Apr 2016 17:50:50 +0000 (17:50 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev

8 years agoMerge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev

8 years agoMerge "Daydream -> screen saver" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:48:47 +0000 (17:48 +0000)]
Merge "Daydream -> screen saver" into nyc-dev

8 years agoTest coverage for new FBE functionality
Fyodor Kupolov [Tue, 12 Apr 2016 00:23:56 +0000 (17:23 -0700)]
Test coverage for new FBE functionality

Added testRemovedAccountSync, which removes account when the user is locked,
and verifies that syncDeCeAccountsLocked works as expected.

Added testPreNDatabaseMigration to test that pre-N database with existing
data is properly upgraded and migrated.

Bug: 26279712
Change-Id: I3846c626f616b1c4830965c9f0cb27fa32ce6f54

8 years agoMerge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev

8 years agoDaydream -> screen saver
Jason Monk [Wed, 20 Apr 2016 17:44:05 +0000 (13:44 -0400)]
Daydream -> screen saver

Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes: 28268243

8 years agoUpdate scan and last network info in the WorkThread
Mitchell Wills [Mon, 18 Apr 2016 21:54:53 +0000 (14:54 -0700)]
Update scan and last network info in the WorkThread

This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.

Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes: 27944510

8 years agoMerge "Allow QS details to scroll when the screen is really small" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:34:18 +0000 (17:34 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev

8 years agoAllow QS details to scroll when the screen is really small
Jason Monk [Wed, 20 Apr 2016 17:30:11 +0000 (13:30 -0400)]
Allow QS details to scroll when the screen is really small

Change-Id: Ib28b6e9d888e864741c3ac472d30ef7cae06fe67
Fixes: 27276984

8 years agoOnly try to add details to zip once.
Felipe Leme [Wed, 20 Apr 2016 17:20:00 +0000 (10:20 -0700)]
Only try to add details to zip once.

When the user enters details (title or description) to the bugreport,
Shell tries to add a title.txt (and/or description.txt) to the zip and
uses 2 instance variables (addedDetailsToZip and addingDetailsToZip) to
control its state.

The problem with the current approach is that if there is a failure
adding the entries (for example, if the entries already exist), these
variables are not updated and hence when the user taps Share, it will
try to add the entries again, which most likely would fail.

BUG: 28291423
Change-Id: I56a71256be4f8de15f8126b815334277319e8e8a

8 years agoMerge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window...
Vladislav Kaznacheev [Wed, 20 Apr 2016 17:11:19 +0000 (17:11 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev

8 years agoMerge "QS tile lifecycle management" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:08:59 +0000 (17:08 +0000)]
Merge "QS tile lifecycle management" into nyc-dev

8 years agowindow: Adds a Sustained Performance Mode window flag.
Ruchi Kandoi [Fri, 15 Apr 2016 02:34:53 +0000 (19:34 -0700)]
window: Adds a Sustained Performance Mode window flag.

Adds setSustainedPerformanceMode(boolean) API for applications to set
the mode for a given window. The mode will be disabled automatically when the
window is no longer in focus.

Bug: 28150358
Change-Id: Ibe8bc564eeaaccbcaad5c4f792cda16da931dffd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
8 years agoTIF: Do not build input list for background user
Dongwon Kang [Tue, 19 Apr 2016 20:39:47 +0000 (13:39 -0700)]
TIF: Do not build input list for background user

Building input list for background user leads to unnecessary connection
request to hardware input and that causes incomplete service state.

Bug: 27407198
Change-Id: Id8d5d5001394781edd2dafe8681c674855332ae3

8 years agoMerge "Made Element accessors thread-safe" into nyc-dev
Yang Ni [Wed, 20 Apr 2016 16:44:38 +0000 (16:44 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev

8 years agoMerge "Clear calling identity when binding a11y services" into nyc-dev
Phil Weaver [Wed, 20 Apr 2016 16:33:26 +0000 (16:33 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev

8 years agoMerge "Reinitialize voice interaction service on unlock" into nyc-dev
Amith Yamasani [Wed, 20 Apr 2016 16:19:44 +0000 (16:19 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev

8 years agoTrack libcore change be1608980825868eb1c70fab6eb86fe06bd304ce
Yi Kong [Wed, 20 Apr 2016 15:34:36 +0000 (16:34 +0100)]
Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Bug: 27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
(cherry picked from commit d7c695d25b1b75657bcbba6b61d62931a1b27d09)
(cherry picked from commit a69302e9e2ebc04447b16657a4e706fb1241ee6b)

8 years agoQS tile lifecycle management
Jason Monk [Wed, 20 Apr 2016 15:41:36 +0000 (11:41 -0400)]
QS tile lifecycle management

Ensure we send out the current QSService and Tile to the TileService
before we write to mWrapper allowing other commands to come through.

Change-Id: Ia3f470083d97d85fa726b1add3706db6278c7d1e
Fixes: 27871492

8 years agoMerge "QS custom tiles - better handling of invalid icons" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:25:42 +0000 (15:25 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev

8 years agoQS custom tiles - better handling of invalid icons
Jason Monk [Wed, 20 Apr 2016 14:54:55 +0000 (10:54 -0400)]
QS custom tiles - better handling of invalid icons

Change-Id: I7b174a078a9df840eb73def101d865a8d630db19
Fixes: 27871180

8 years agoMerge "Fix QS edit accessibility" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:14:50 +0000 (15:14 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev

8 years agoFix QS edit accessibility
Jason Monk [Wed, 20 Apr 2016 15:10:23 +0000 (11:10 -0400)]
Fix QS edit accessibility

Change-Id: Ibce7bdf480751994b318cba3a9954365f0ed8786
Fixes: 28194074

8 years agoTrack libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7
Shubham Ajmera [Wed, 20 Apr 2016 15:06:55 +0000 (16:06 +0100)]
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Bug: 27426743
Change-Id: I7276e39951d721704726132281c316c77bdab515

8 years agoMerge "Expose additional fields needed by PrintRecommendationService GTS test and...
Philip P. Moltmann [Wed, 20 Apr 2016 15:01:03 +0000 (15:01 +0000)]
Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev