OSDN Git Service
Felipe Leme [Thu, 21 Apr 2016 03:44:15 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am:
333e808b34
* commit '
333e808b34397258457813b6d7d970da72e76925':
Removed obsolete screenshot mention from full bugreport.
Change-Id: Ieba4b10f6b46e1805e28288b9ada2e48417cf66b
TreeHugger Robot [Thu, 21 Apr 2016 03:34:45 +0000 (03:34 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 03:26:06 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am:
568e63bc9b
* commit '
568e63bc9b53537505016f41e48e908c4da863e5':
Remove obsolete TODO
Change-Id: I11019dd003ed10184a0c0808b6d1021c5b2ecc40
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am:
69e3618f07
* commit '
69e3618f07be6f48bfc37c52e6ef5830f717b495':
Do not make files in zip disabled in ACTION_VIEW.
Change-Id: I9908e4db12640251a5fd60ca0fff950078d628aa
TreeHugger Robot [Thu, 21 Apr 2016 03:18:46 +0000 (03:18 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:17:01 +0000 (03:17 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:51 +0000 (02:46 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
am:
316c68f144
* commit '
316c68f144946a3019cc8f314921e8588c766b71':
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: If4cc351b8674343cbb83e22bcfccf9e7b4d00484
Ruchi Kandoi [Thu, 21 Apr 2016 02:37:48 +0000 (02:37 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Nathan Harold [Thu, 21 Apr 2016 02:16:03 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am:
f6496db8ce
* commit '
f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()
Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
Nathan Harold [Thu, 21 Apr 2016 02:09:26 +0000 (02:09 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:42:49 +0000 (01:42 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
am:
4b88bddb12
* commit '
4b88bddb12a62ec2d791d45e5b995aab87666a7b':
Fix a11y key event handling from multiple devices.
Change-Id: Ie054d5be82eed912696af2775e382e67e3025bf0
Phil Weaver [Thu, 21 Apr 2016 01:38:47 +0000 (01:38 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 01:36:18 +0000 (18:36 -0700)]
Remove obsolete TODO
Change-Id: Ia76b7f1cea0799c46ae5c933741c865869e39f5f
Fixes:
27550895
Jorim Jaggi [Thu, 21 Apr 2016 01:20:20 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am:
54d056ed6d
* commit '
54d056ed6d75083ce166eb003fb93efc53cefea5':
Fix IME adjust in SysUI
Change-Id: I5e7634ff459865622cb5ea819d4358827796e8ae
Christopher Tate [Thu, 21 Apr 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am:
157ae98762
* commit '
157ae987627ce93939c40dc6f1f3913b243973ae':
Only invoke k/v helpers during k/v operations
Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b
Jaewan Kim [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am:
34a96e704e
* commit '
34a96e704e6bc12cc06d186ad7a344706a8afb5b':
PIP: Support accessibility
Change-Id: Ida4ae767c45904a18aca577d79c918538125df62
TreeHugger Robot [Thu, 21 Apr 2016 01:17:55 +0000 (01:17 +0000)]
Merge "Fix IME adjust in SysUI" 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
Jaewan Kim [Thu, 21 Apr 2016 01:11:38 +0000 (01:11 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
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
Wale Ogunwale [Thu, 21 Apr 2016 01:06:20 +0000 (01:06 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
am:
4d07c88919
* commit '
4d07c8891913a338d13ffe56133e24b0d167519f':
Exclude IME dialogs from tap outside task bounds funcationality
Change-Id: I5840178b130a01e8db8441db628043221965bf5e
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
Amith Yamasani [Thu, 21 Apr 2016 00:50:10 +0000 (00:50 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
am:
2be4c463bc
* commit '
2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
Throw better exception when startVoiceActivity fails
Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
Adam Lesinski [Thu, 21 Apr 2016 00:50:07 +0000 (00:50 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am:
c708cf6340
* commit '
c708cf6340e623202e562992e6ef4062ace84cab':
BatteryStatsHelper: Include screen on baseline power draw
Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
Shreyas Basarge [Thu, 21 Apr 2016 00:50:04 +0000 (00:50 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
am:
bb9dd3c9fd
* commit '
bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
Fix logspam by JobInfo
Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Throw better exception when startVoiceActivity fails" 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
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
Tim Murray [Thu, 21 Apr 2016 00:39:06 +0000 (00:39 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am:
150553756f
* commit '
150553756f89a51cc70b24cd9dbab4bdfba0fc59':
Increase the max binder thread pool size for system_server.
Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652
Philip P. Moltmann [Thu, 21 Apr 2016 00:34:36 +0000 (00:34 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
am:
41304f47f4
* commit '
41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
Prevent printing from finishing activity.
Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45
Adrian Roos [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
am:
206748d10e
* commit '
206748d10e5f3b42e198af6a2e0801fb47ec3c01':
A11y: Fix battery icon and clock descriptions
Change-Id: I92f4bad9e6224fdafd7a48e3ceec3452c7150e03
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
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." 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
Philip P. Moltmann [Thu, 21 Apr 2016 00:23:34 +0000 (00:23 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
am:
50a871857d
* commit '
50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
Print API for N: Fix docs and change interfaces as requested.
Change-Id: Id9b2b228001802d6b5325e6b01d318e265541441
Jorim Jaggi [Thu, 21 Apr 2016 00:23:30 +0000 (00:23 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev
am:
1fa356289e
* commit '
1fa356289e50d9a48d84afe831b230b087870e76':
Disallow changing stacks if top activity
Change-Id: I9ae3ec2054b835724fead6ec8a940b228018ffba
Ruchi Kandoi [Thu, 21 Apr 2016 00:20:09 +0000 (17:20 -0700)]
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Vladislav Kaznacheev [Thu, 21 Apr 2016 00:18:20 +0000 (00:18 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am:
28609360cf
* commit '
28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow
Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
Robert Carr [Thu, 21 Apr 2016 00:18:13 +0000 (00:18 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am:
abadeba99a
* commit '
abadeba99afbb1d80a38b396407822c96c7e3706':
Prevent recents from closing while moving PiP to fullscreen.
Change-Id: I672c73f0a60fd37498e647edec42c8be3e10780e
Suprabh Shukla [Thu, 21 Apr 2016 00:18:04 +0000 (00:18 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev
am:
6c0ead993e
* commit '
6c0ead993e48f6e260972171b1187ef77b6094fb':
Removing disk access from startActivity thread
Change-Id: I0115c5a8c9f7c1550f09ac8b9c1025f83e09bace
Eino-Ville Talvala [Thu, 21 Apr 2016 00:17:55 +0000 (00:17 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am:
5856779c3a
* commit '
5856779c3a3e00e256cdf5cb571a85975d781cf4':
Camera2: Ignore exception on double-completed capture sequences.
Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e
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
Adrian Roos [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am:
75fe7d5d79
* commit '
75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button
Change-Id: I4edee46cb06a4c6f7beadab5e8a56cdc902fdbec
Felipe Leme [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am:
3053c3f2a9
* commit '
3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.
Change-Id: I6ff60394218bceac0fdd4eed4839f5819f532180
TreeHugger Robot [Thu, 21 Apr 2016 00:11:49 +0000 (00:11 +0000)]
Merge "Disallow changing stacks if top activity" 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
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
TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]
Merge "Removing disk access from startActivity thread" 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
Jorim Jaggi [Wed, 20 Apr 2016 23:42:06 +0000 (16:42 -0700)]
Fix IME adjust in SysUI
- Make sure scale is correct.
- Adjust interpolator to match WindowManager.
Bug:
28175599
Change-Id: Ica94b3dbac2fcc6e4b8a75faa311fb7861071ccc
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
Adam Lesinski [Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)]
Merge "Doze settings example not matching real keys" am:
570a13f
am:
790699d
* commit '
790699db64ee18d143cd9813e91044fcc5a26713':
Doze settings example not matching real keys
Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f
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
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
TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am:
1362ae0
* commit '
1362ae062a196c8450a0b649dd0c5af66d1f05a1':
ResourcesManager: Throw exception if failed to load asset path
Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
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
Henrik Baard [Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)]
Merge "Doze settings example not matching real keys"
am:
570a13f
* commit '
570a13f0cb233b4a216243025a9fed3df3c72849':
Doze settings example not matching real keys
Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f
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
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
Adam Lesinski [Wed, 20 Apr 2016 22:37:18 +0000 (22:37 +0000)]
Merge "Doze settings example not matching real keys"
Lifu Tang [Wed, 20 Apr 2016 22:30:55 +0000 (22:30 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
am:
a381455
* commit '
a381455472a814c8dbd98fcb4312f46ed1373c88':
Added defensive code to prevent system crash
Change-Id: I97dd4a994c86bf9bc845de08a8ff9c303bb86240
Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am:
e1b5171
* commit '
e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement
Change-Id: Ic20b5232d5114486dbefb5c4adf1409ecf1b3870
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
Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]
Merge "Added defensive code to prevent system crash" 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
Christopher Tate [Wed, 20 Apr 2016 22:13:17 +0000 (22:13 +0000)]
Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am:
665189f
* commit '
665189f92646d34bf02082120cba3c62aa718770':
Don't back up wallpapers that we've been told not to
Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
Christopher Tate [Wed, 20 Apr 2016 22:13:15 +0000 (22:13 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c am:
b965ced -s ours
am:
129c01a
* commit '
129c01af82df8560f9db9c990651e54689e55274':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iea83a750479615a4cec01179b8df2f4880c61cc6
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
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
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
Robert Carr [Wed, 20 Apr 2016 21:52:39 +0000 (21:52 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev
am:
5a6c58e
* commit '
5a6c58e00202ed83cd60a02cd6a79da65598b655':
Do not prematurely update position while bounds animating.
Change-Id: I35f86944de95f50947384ba104e91d7d4a85f58b
Jim Miller [Wed, 20 Apr 2016 21:52:36 +0000 (21:52 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am:
54c4374
* commit '
54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba
Phil Burk [Wed, 20 Apr 2016 21:52:33 +0000 (21:52 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev
am:
2faac0d
* commit '
2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
MidiDevice: do not open ports on closed device
Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
Fyodor Kupolov [Wed, 20 Apr 2016 21:52:30 +0000 (21:52 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
am:
366a457
* commit '
366a457b6da6caf3d376a8ef0be6a386aee5c216':
Test coverage for new FBE functionality
Change-Id: I4f271c0046a96642cfb8f5c81ca5c6a7c41d7062
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
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
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
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
Vladislav Kaznacheev [Wed, 20 Apr 2016 21:40:32 +0000 (14:40 -0700)]
Add JavaDoc for View.updateDragShadow
Bug:
28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
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
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
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
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
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
Ruchi Kandoi [Wed, 20 Apr 2016 21:14:59 +0000 (21:14 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
am:
0fea8ad
* commit '
0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
Revert "PowerManager: Adds the Sustained performance API."
Change-Id: I7a5d0be180f9c224b9ccb2551ab4f0dbf7c9c4e9
Shubham Ajmera [Wed, 20 Apr 2016 21:14:55 +0000 (21:14 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am:
f3d5a4d
* commit '
f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7
Change-Id: I4b34b2effa629b184ca50453c673b61ea3d6a47b
Chong Zhang [Wed, 20 Apr 2016 21:14:51 +0000 (21:14 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
am:
3966fb9
* commit '
3966fb942c7a9445a8cc94aeafc445778c2311b4':
Fix IME adjust when stack focus changes while IME is visible
Change-Id: If2fa6c6c62a08c957520d9a58483020b9fe6d220
Ruchi Kandoi [Wed, 20 Apr 2016 21:14:47 +0000 (21:14 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
am:
a645c97
* commit '
a645c9753ff004e616a6df4a15c9d2e999508d91':
window: Adds a Sustained Performance Mode window flag.
Change-Id: Ib839ac8cd7dfa0e216de46bb8b343787d230a36c
Ruben Brunk [Wed, 20 Apr 2016 21:14:42 +0000 (21:14 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
am:
6ada702
* commit '
6ada702993227233fd362e98de93cc9e798dc75d':
Add settings for altering VR display behavior.
Change-Id: Iaf8584c47a91b0a49c4075e6d4fcef10afc3ae11
destradaa [Wed, 20 Apr 2016 21:14:36 +0000 (21:14 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev
am:
fdb26b9
* commit '
fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
Add support for multiple callback registration in.
Change-Id: I52d4f7f2bc7d79ebd80759a94c7cdd23ba724144
Dongwon Kang [Wed, 20 Apr 2016 21:14:26 +0000 (21:14 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev
am:
4a6bd4b
* commit '
4a6bd4b48fe309f50a3878d85104be6fbf244d50':
TIF: Do not build input list for background user
Change-Id: Idedf4275658266e931f0d60906f6459e1e7c1317
Julia Reynolds [Wed, 20 Apr 2016 21:14:09 +0000 (21:14 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev
am:
1ff2412
* commit '
1ff2412cc49424ffe9594538618d063c1e0a6951':
Align radio buttons with app icon, change text color.
Change-Id: I387574f49cb2b277329344bb67311dae3b442d27
Julia Reynolds [Wed, 20 Apr 2016 21:13:45 +0000 (21:13 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
am:
e86ac2f
* commit '
e86ac2f0da9ec71e9d990291053eec8f352af52d':
Animate volume dialog expansion/contraction.
Change-Id: Icbca2a9a418f8461d5134c7e10eff7f0556554d8
Fyodor Kupolov [Wed, 20 Apr 2016 21:13:39 +0000 (21:13 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
Felipe Leme [Wed, 20 Apr 2016 21:13:17 +0000 (21:13 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
am:
0304688
* commit '
03046888822d07ec020eb7a2f685be4f7bcded31':
Only try to add details to zip once.
Change-Id: I629618cc5cf105584ebf911b3de1b6649f1c59c6
Mitchell Wills [Wed, 20 Apr 2016 21:13:04 +0000 (21:13 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa am:
2dbac6c
am:
de629c7
* commit '
de629c7ac77719ec6223254825a3e3b099c364c1':
Update scan and last network info in the WorkThread
Change-Id: I37403f37ae66b4f8fef41f8b201d79a3e6f4bad9
Andreas Gampe [Wed, 20 Apr 2016 21:12:53 +0000 (21:12 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am:
58f2072
* commit '
58f20726e99947a0f2781b5d4be3052be6eb94dd':
Frameworks/base: Add holder to BaseBundle
Change-Id: I0b177b9a7b3b11e579b8cc62b89e4036908bf237
Trevor Johns [Wed, 20 Apr 2016 21:12:38 +0000 (21:12 +0000)]
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am:
59c9a93
* commit '
59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
Robert Carr [Wed, 20 Apr 2016 21:12:27 +0000 (21:12 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
am:
db973df
* commit '
db973df830c32af8e2aeff256053299409f65dfd':
When restacking IM windows preserve relative order.
Change-Id: I9e6a52ea69f908fbebd8a39208d071ff70b97db0