OSDN Git Service
Lifu Tang [Wed, 20 Apr 2016 22:30:53 +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: I7a48940b04b3033ab2c5e0f370098749e4fdd8fd
Lifu Tang [Wed, 20 Apr 2016 22:30:52 +0000 (22:30 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am:
e1b5171
* commit '
e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement
Change-Id: I89d094509612073a7e7e046db48f896a653d42a9
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:08 +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: I60eb02a9b1ab8da966d964c62a6dccf52d873e94
Christopher Tate [Wed, 20 Apr 2016 22:13:07 +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: I52a5a34af6acb17d63ae43ac999609de6994be88
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
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
Robert Carr [Wed, 20 Apr 2016 21:43:21 +0000 (21:43 +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: I7ad0d28dbe7e4224c7ce50fb6996ccec98d7fd4b
Jim Miller [Wed, 20 Apr 2016 21:43:19 +0000 (21:43 +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: Ib762515ea86e8dc9eb475f1a3f0eb472da6447c4
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
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:22:12 +0000 (21:22 +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: I81303c3d44494eab901a33b1376ce2b18c74ef73
Fyodor Kupolov [Wed, 20 Apr 2016 21:22:11 +0000 (21:22 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
am:
366a457
* commit '
366a457b6da6caf3d376a8ef0be6a386aee5c216':
Test coverage for new FBE functionality
Change-Id: I53c16de6aa812565137092a4b060daf9c915fe85
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
Fyodor Kupolov [Wed, 20 Apr 2016 21:13:39 +0000 (21:13 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 21:08:05 +0000 (21:08 +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: Ia121fd434e0a3b441e510452f258861550b90c23
Shubham Ajmera [Wed, 20 Apr 2016 21:00:49 +0000 (21:00 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am:
f3d5a4d
* commit '
f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7
Change-Id: I296d2c4a5700ac7fb882d2b02d434796cd6527df
Chong Zhang [Wed, 20 Apr 2016 21:00:46 +0000 (21:00 +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: I53a0d8101b13443c30182909d02d952fce2fede6
Ruchi Kandoi [Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
Shubham Ajmera [Wed, 20 Apr 2016 20:52:56 +0000 (20:52 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" 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
Fan Zhang [Wed, 20 Apr 2016 20:50:15 +0000 (20:50 +0000)]
Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev
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>
Ruchi Kandoi [Wed, 20 Apr 2016 20:42:25 +0000 (20:42 +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: I8d3803ce5530ae84a876d66690b3fdb907ebc96b
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
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
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of
44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
Ruben Brunk [Wed, 20 Apr 2016 19:57:37 +0000 (19:57 +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: I1816516b1d9c459c0d7bef77c72d9173da7fc3c9
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
destradaa [Wed, 20 Apr 2016 19:30:51 +0000 (19:30 +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: Ifffd31cdafdde3fe1f9b7118cab1485486531b33
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>
Dongwon Kang [Wed, 20 Apr 2016 19:24:24 +0000 (19:24 +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: Ibd788b4903e306c1b18a093183880001dbf14475
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
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
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
Julia Reynolds [Wed, 20 Apr 2016 19:14:36 +0000 (19: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: I6b3cdbd36ee669a5fa32417cee14837258f7f6b8
Julia Reynolds [Wed, 20 Apr 2016 19:14:35 +0000 (19:14 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
am:
e86ac2f
* commit '
e86ac2f0da9ec71e9d990291053eec8f352af52d':
Animate volume dialog expansion/contraction.
Change-Id: I7c08343c0400ca34031b5908adfee71f80adf5c9
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
Julia Reynolds [Wed, 20 Apr 2016 19:07:12 +0000 (19:07 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
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
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
Felipe Leme [Wed, 20 Apr 2016 19:04:41 +0000 (19:04 +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: Ifa0728bac7fa9a138e129ab66f5949fdc0af51ef
Mitchell Wills [Wed, 20 Apr 2016 19:04:40 +0000 (19:04 +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: I9e783bd423ca88d4a4094c705b29b314d68f9e5e
Andreas Gampe [Wed, 20 Apr 2016 19:04:38 +0000 (19:04 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am:
58f2072
* commit '
58f20726e99947a0f2781b5d4be3052be6eb94dd':
Frameworks/base: Add holder to BaseBundle
Change-Id: I46e5f350f8b862132d97b375e8a170e21dc70d31
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
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
Julia Reynolds [Wed, 20 Apr 2016 18:37:39 +0000 (14:37 -0400)]
Animate volume dialog expansion/contraction.
Bug:
28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95
Andreas Gampe [Wed, 20 Apr 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
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
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
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
Lifu Tang [Wed, 20 Apr 2016 18:48:16 +0000 (11:48 -0700)]
Fixed bug in upgrading GpsMeasurement
Bug:
28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a
Trevor Johns [Wed, 20 Apr 2016 18:43:55 +0000 (18:43 +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: I3ce213d0e7412125861d39f1726be4b5a751c828
Robert Carr [Wed, 20 Apr 2016 18:37:28 +0000 (18:37 +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: I83209e07dc6f65285ba2a67dd9393e520908219b
Robert Carr [Wed, 20 Apr 2016 18:37:27 +0000 (18:37 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am:
5a2554a
* commit '
5a2554a8544525953c0847a1d3c975413eb07986':
Respect WRAP_CONTENT when resolving drop down position.
Change-Id: Ie466c526c84d26caddc5577f231e58738733d983
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
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
Rob Carr [Wed, 20 Apr 2016 18:30:40 +0000 (18:30 +0000)]
Merge "When restacking IM windows preserve relative order." 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
Yi Kong [Wed, 20 Apr 2016 18:13:19 +0000 (18:13 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
am:
8c205b5
* commit '
8c205b5a2d3b138dc95648188dd15a1abd7dd81e':
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Change-Id: Ia0872d3863c03250d36cb9f5369ce54ca125dce1
Sudheer Shanka [Wed, 20 Apr 2016 18:13:17 +0000 (18:13 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
am:
df9ecfc
* commit '
df9ecfc587615edc80c6bf96e67d7dc4d510e03f':
Add restrictedSwitchSummary attribute to restricted switch preferences.
Change-Id: Ie74b078ccf945cba8d702080d5195e77a2be987d
Yi Kong [Wed, 20 Apr 2016 18:04:45 +0000 (18:04 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
Insun Kang [Wed, 20 Apr 2016 17:59:32 +0000 (17:59 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
am:
801d416
* commit '
801d4161dd9e872bec73d855d21d030ba39a8b91':
ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail
Change-Id: I149ab7790af6442ce3f1437465723fd331718ef2
Sudheer Shanka [Wed, 20 Apr 2016 17:59:31 +0000 (17:59 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
am:
205d10b
* commit '
205d10bb136e36a17662fb1e60b0e002ca1f7158':
Fix additional summary of RestrictedSwitchPreference.
Change-Id: I8c16ff47a743a17f31c2db1f88c810aba74823d2
Jason Monk [Wed, 20 Apr 2016 17:52:58 +0000 (17:52 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
am:
eeaaf26
* commit '
eeaaf26805091cad0404bc6030dde38dd4b1edcc':
Daydream -> screen saver
Change-Id: I090caed428e1137a4ecfe628abb1c2974c99c225
Felipe Leme [Wed, 20 Apr 2016 17:52:57 +0000 (17:52 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am:
9724fba
* commit '
9724fba83545fd075cbda62bb13cdc7820c7291a':
Added onRestrictBackgroundWhitelistChanged callback.
Change-Id: Ic8fdb634babafd5625be2a7c684334cca1cf0a3a
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
Sudheer Shanka [Wed, 20 Apr 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:48:47 +0000 (17:48 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
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
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:44:05 +0000 (13:44 -0400)]
Daydream -> screen saver
Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes:
28268243
Jason Monk [Wed, 20 Apr 2016 17:38:50 +0000 (17:38 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
am:
10ea519
* commit '
10ea519fa9dc31721dcf5974f423797cbbf8c80d':
Allow QS details to scroll when the screen is really small
Change-Id: Ic4b2d01b78ede96bf0bee394c61670953d8403ba
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
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
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
Fan Zhang [Tue, 29 Mar 2016 17:30:13 +0000 (10:30 -0700)]
Allow fragments set their own header view below actionbar.
Bug:
27751187
Bug:
28269035
Change-Id: Iac081c009800a71afe413cf63ddd9788b2e90d6a
(cherry picked from commit
ff2e0f4be8d0085f6db2315bcf184eccdbb69554)
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
Vladislav Kaznacheev [Wed, 20 Apr 2016 17:16:11 +0000 (17:16 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
am:
c8df6aa
* commit '
c8df6aa42facbe0cf7c05e4db78ec4a4e224b78b':
Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window
Change-Id: I001979d4151a8e2b9e71c471a8aa51c0165d3b40
Jason Monk [Wed, 20 Apr 2016 17:16:10 +0000 (17:16 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
am:
e59bbb0
* commit '
e59bbb0899e17710e9380b704141b100ddc2faa0':
QS tile lifecycle management
Change-Id: I739df683b36689dbc58c784c6aa9447e28139ef5
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
Jason Monk [Wed, 20 Apr 2016 17:08:59 +0000 (17:08 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
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>
Yang Ni [Wed, 20 Apr 2016 16:52:41 +0000 (16:52 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
am:
c74d2a8
* commit '
c74d2a8b8795bb0679225afcdd4d446c29440d85':
Made Element accessors thread-safe
Change-Id: I0fabd87d166015c0a6593709a32891296e2ade46
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
Yang Ni [Wed, 20 Apr 2016 16:44:38 +0000 (16:44 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
Phil Weaver [Wed, 20 Apr 2016 16:39:50 +0000 (16:39 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
am:
b72c306
* commit '
b72c30653dc9652d9c6beba979e5ea194c1a4638':
Clear calling identity when binding a11y services
Change-Id: I0bb94ebc66098ca173f3b46e1ebdc87aad937b3f
Phil Weaver [Wed, 20 Apr 2016 16:33:26 +0000 (16:33 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
Amith Yamasani [Wed, 20 Apr 2016 16:24:31 +0000 (16:24 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
am:
ea61e63
* commit '
ea61e63bf8f1f92a837fc42eed037aabaa8d03b9':
Reinitialize voice interaction service on unlock
Change-Id: I2dd39bb3a2543710c6c5de01878f915d52e4f95c
Amith Yamasani [Wed, 20 Apr 2016 16:19:44 +0000 (16:19 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
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)
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
Jason Monk [Wed, 20 Apr 2016 15:31:51 +0000 (15:31 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev
am:
e6be9c5
* commit '
e6be9c58cca6a523960553faf164398b0297089c':
QS custom tiles - better handling of invalid icons
Change-Id: Ic7438463e3e1d9961e511a8c5b810e6ab975ee50
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
OSDN Git Service
