OSDN Git Service
Mitchell Wills [Thu, 11 Aug 2016 18:05:03 +0000 (11:05 -0700)]
Add Log.wtf when transitionTo is used improperly
Using transitionTo in exit/enter (except in the terminal state) is
documented as undefined behavior and may cause unexpected results.
The current implementation appears to finish the current transition and
then transition to the new target state.
TEST=flash and play with the phone, no sign of immediate WTFs
Change-Id: I38a34b85c43d53c51514339587fc1269a069a454
Adrian Roos [Wed, 10 Aug 2016 17:28:18 +0000 (17:28 +0000)]
Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev am:
d4a95806ab am:
6c682c5926
am:
718ad4068b
Change-Id: I1fd1a342e6e5933bbe084293f4d1f5b27ede43da
Adrian Roos [Wed, 10 Aug 2016 17:28:14 +0000 (17:28 +0000)]
Notification: Reuse drawable in Header if Icon unchanged am:
c4337a3569 am:
dd33f36fc4
am:
425ade9ef0
Change-Id: Ifb22fc29cdfb3adef1bfd4f49dc30753b30f403c
Evan Rosky [Wed, 10 Aug 2016 17:15:19 +0000 (17:15 +0000)]
Merge "Add UI-disabled tests for UserController"
Adrian Roos [Wed, 10 Aug 2016 17:12:41 +0000 (17:12 +0000)]
Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev am:
d4a95806ab
am:
6c682c5926
Change-Id: I5e2b6e0fb61818bdbcb8d0a97c772c5a3dcbc546
Adrian Roos [Wed, 10 Aug 2016 17:12:38 +0000 (17:12 +0000)]
Notification: Reuse drawable in Header if Icon unchanged am:
c4337a3569
am:
dd33f36fc4
Change-Id: Ia24b71281669458d544ea34cb643265610ef020a
Adrian Roos [Wed, 10 Aug 2016 17:06:19 +0000 (17:06 +0000)]
Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev
am:
d4a95806ab
Change-Id: I5320868dd605bca45838cc8b32c0789e0bb60106
Adrian Roos [Wed, 10 Aug 2016 17:06:17 +0000 (17:06 +0000)]
Notification: Reuse drawable in Header if Icon unchanged
am:
c4337a3569
Change-Id: I8e7da247e9b4d9a9acd46c29ca29d34409bb9453
Siyamed Sinir [Wed, 10 Aug 2016 16:56:45 +0000 (16:56 +0000)]
Merge "Use SpannableFactory for TextView.removeSuggestionSpans"
Mitchell Wills [Wed, 10 Aug 2016 16:53:22 +0000 (16:53 +0000)]
Merge "Reenable the unit tests for StateMachine"
Adrian Roos [Wed, 10 Aug 2016 16:52:14 +0000 (16:52 +0000)]
Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev
Kirill Grouchnikov [Wed, 10 Aug 2016 12:27:49 +0000 (12:27 +0000)]
Merge "Document exceptions thrown by KeyCharacterMap APIs"
Narayan Kamath [Wed, 10 Aug 2016 08:54:42 +0000 (08:54 +0000)]
Merge "Zygote: Better logging for setgroups failures." into nyc-mr1-dev am:
ab6e7c3502 am:
c852a4e77b
am:
3099511470
Change-Id: I956b0ae00cfb3ae0a07463e8ded17a4664f031d3
Narayan Kamath [Wed, 10 Aug 2016 08:54:38 +0000 (08:54 +0000)]
Zygote: Better logging for setgroups failures. am:
593aab732d am:
f72999b8aa
am:
7dc461f4c6
Change-Id: I800979f391ba810ff37ceebc845582e5d8ab7b47
Narayan Kamath [Wed, 10 Aug 2016 08:49:10 +0000 (08:49 +0000)]
Merge "Zygote: Better logging for setgroups failures." into nyc-mr1-dev am:
ab6e7c3502
am:
c852a4e77b
Change-Id: I84c5d597e59be5ab6a935b1d49c1ffb04c888ee3
Narayan Kamath [Wed, 10 Aug 2016 08:49:06 +0000 (08:49 +0000)]
Zygote: Better logging for setgroups failures. am:
593aab732d
am:
f72999b8aa
Change-Id: I0352a0297b47065e61bb5bfa93de1745fa3fb499
TreeHugger Robot [Wed, 10 Aug 2016 08:48:31 +0000 (08:48 +0000)]
Merge "Fix MtpDatabaseTest#testFormatCodeForMpeg."
Narayan Kamath [Wed, 10 Aug 2016 08:43:35 +0000 (08:43 +0000)]
Merge "Zygote: Better logging for setgroups failures." into nyc-mr1-dev
am:
ab6e7c3502
Change-Id: I905496f5a4f1111346da571c7051d526e2821f95
Narayan Kamath [Wed, 10 Aug 2016 08:43:33 +0000 (08:43 +0000)]
Zygote: Better logging for setgroups failures.
am:
593aab732d
Change-Id: I97a4a932377f2231e86393d7047b76b1369b0df1
Narayan Kamath [Wed, 10 Aug 2016 08:32:42 +0000 (08:32 +0000)]
Merge "Zygote: Better logging for setgroups failures." into nyc-mr1-dev
Justin Klaassen [Wed, 10 Aug 2016 06:13:06 +0000 (06:13 +0000)]
TwilightService v2.0 am:
908b86c796 am:
f7aa8bcb20
am:
2f6aac3380
Change-Id: I3f982ae736f33f6da20d7d197d551c1408ab2d5f
Justin Klaassen [Wed, 10 Aug 2016 06:06:55 +0000 (06:06 +0000)]
TwilightService v2.0 am:
908b86c796
am:
f7aa8bcb20
Change-Id: Ic2d826dbec21f9558f6a21af7a6d25963bf40d59
Justin Klaassen [Wed, 10 Aug 2016 06:00:53 +0000 (06:00 +0000)]
TwilightService v2.0
am:
908b86c796
Change-Id: I167cb9dfa140b61261ae88f76b332f6115b36a3a
Daichi Hirono [Wed, 10 Aug 2016 05:59:18 +0000 (14:59 +0900)]
Fix MtpDatabaseTest#testFormatCodeForMpeg.
ag/
1241051 explicitly specified the primary mime type for MTP format
code. And it changes mime type for MtpConstants.FORMAT_MPEG from
video/mp4 to video/mpeg.
FIX=
30266226
Change-Id: I362bd7d651140b9928aa76e0d54e4769296d9498
Jin Seok Park [Wed, 10 Aug 2016 05:04:27 +0000 (05:04 +0000)]
Merge "ExifInterface: Add support for DNG thumbnail cases"
Justin Klaassen [Mon, 8 Aug 2016 16:18:42 +0000 (09:18 -0700)]
TwilightService v2.0
- Switched to using CalendarAstronomer for more accurate sunrise/sunset
times.
- Exposed sunrise/sunset times via TwilightState so that clients can
track the current twilight period and perform their own
interpolations.
- Adopted LocationRequest API for fused location updates:
(low power, min 1h, max 10m).
- TwilightService is now only activated when a listener is registered,
minimizing impact to system health on platforms / configurations
where twilight state is not needed.
Bug:
28588307
Bug:
30190450
Bug:
30282370
Bug:
30650316
Change-Id: Ic5c94d8608e8bb3a3d895e623676a1468d4abdcd
Keisuke Kuroyanagi [Wed, 10 Aug 2016 03:11:53 +0000 (03:11 +0000)]
Merge "Catch more Exceptions for reading InputMethodSubtype."
Erik Kline [Wed, 10 Aug 2016 02:55:05 +0000 (02:55 +0000)]
Merge "Fix up some comments in IPv6 tethering code." into nyc-mr1-dev am:
3cc5d047a7 am:
6a76c5f191
am:
6d9d108e52
Change-Id: I000a74bbf2f478ebbbd57fffe8992250b9fa83bd
Erik Kline [Wed, 10 Aug 2016 02:54:58 +0000 (02:54 +0000)]
Fix up some comments in IPv6 tethering code. am:
d1dcbefe06 am:
dba85b451f
am:
c6f00dc461
Change-Id: Ic8fd3f2f8939458a48dd399c0539cbbb4130c70a
Suprabh Shukla [Wed, 10 Aug 2016 02:54:49 +0000 (02:54 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev am:
521e27d652 am:
78223aa37c
am:
e9d1f3c8ae
Change-Id: I09ee8bc8eda9db8eca15335bd6093746873c85a3
Suprabh Shukla [Wed, 10 Aug 2016 02:54:42 +0000 (02:54 +0000)]
Fixing admins not being removed from DpmMockContext am:
3cb2b49f44 am:
b133a72f8b
am:
91a75a3a82
Change-Id: I6c4738d526cab8ec3b1f5a16f71580e6f8306c55
Erik Kline [Wed, 10 Aug 2016 02:49:17 +0000 (02:49 +0000)]
Merge "Fix up some comments in IPv6 tethering code." into nyc-mr1-dev am:
3cc5d047a7
am:
6a76c5f191
Change-Id: Ide4dcb9a5209065a41e002020b6ea6f70878402a
Erik Kline [Wed, 10 Aug 2016 02:49:08 +0000 (02:49 +0000)]
Fix up some comments in IPv6 tethering code. am:
d1dcbefe06
am:
dba85b451f
Change-Id: I7dc90247a957ccd30ad593a6f8c6f29575069d95
Suprabh Shukla [Wed, 10 Aug 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev am:
521e27d652
am:
78223aa37c
Change-Id: Ibcd5967decd1b694d31b2a2fecc59e4c6ae87409
Suprabh Shukla [Wed, 10 Aug 2016 02:48:51 +0000 (02:48 +0000)]
Fixing admins not being removed from DpmMockContext am:
3cb2b49f44
am:
b133a72f8b
Change-Id: I9987b02cc0353b4bad45198c8bc00c1a2086b0ab
Jin Park [Mon, 8 Aug 2016 04:30:01 +0000 (13:30 +0900)]
ExifInterface: Add support for DNG thumbnail cases
DNG files have a unique way of identifying their image compression
type. This CL addresses this issue by adding support for cases
mentioned in the DNG Specifications.
Bug:
30727870
Change-Id: I416b9fb49872e9c878193f346dcaad5f45b0b995
Erik Kline [Wed, 10 Aug 2016 02:39:08 +0000 (02:39 +0000)]
Merge "Fix up some comments in IPv6 tethering code." into nyc-mr1-dev
am:
3cc5d047a7
Change-Id: Ida9d04e4d7185ad5cbe95898f3af80194002f9d2
Erik Kline [Wed, 10 Aug 2016 02:39:05 +0000 (02:39 +0000)]
Fix up some comments in IPv6 tethering code.
am:
d1dcbefe06
Change-Id: Icb77a16f14591aa54cc0302b8a7bd9b377ec5eea
Suprabh Shukla [Wed, 10 Aug 2016 02:39:02 +0000 (02:39 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev
am:
521e27d652
Change-Id: Id595e024e1c899c2014feb0c39bb1ca15a1fe70c
Suprabh Shukla [Wed, 10 Aug 2016 02:39:00 +0000 (02:39 +0000)]
Fixing admins not being removed from DpmMockContext
am:
3cb2b49f44
Change-Id: I9baefc5e069a2b8d37fa2b6c1e55d9eaebd02f26
Jin Seok Park [Wed, 10 Aug 2016 02:35:51 +0000 (02:35 +0000)]
Merge "ExifInterface: Remove AssetInputStream dependency"
TreeHugger Robot [Wed, 10 Aug 2016 02:24:12 +0000 (02:24 +0000)]
Merge "Fix up some comments in IPv6 tethering code." into nyc-mr1-dev
TreeHugger Robot [Wed, 10 Aug 2016 02:23:53 +0000 (02:23 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev
Ruben Brunk [Wed, 10 Aug 2016 01:31:16 +0000 (01:31 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev am:
8d84bc861f am:
0837aa4070
am:
f6a448e763
Change-Id: I10274995205ff61e64995bc5be957d9ddad71d1c
Ruben Brunk [Wed, 10 Aug 2016 01:31:13 +0000 (01:31 +0000)]
Fix setVrThread's exception handling. am:
83ea55a9c6 am:
b25be4bd37
am:
34e4e80db1
Change-Id: Iec0098aa85e3388cadf18f644451189005908065
Ruben Brunk [Wed, 10 Aug 2016 01:24:37 +0000 (01:24 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev am:
8d84bc861f
am:
0837aa4070
Change-Id: I4c8cb0515fce44ed594e4a92362e0a267a31495a
Ruben Brunk [Wed, 10 Aug 2016 01:24:33 +0000 (01:24 +0000)]
Fix setVrThread's exception handling. am:
83ea55a9c6
am:
b25be4bd37
Change-Id: I659f75876581fb97359dc516bd7d1bd31cf52485
Erik Kline [Wed, 10 Aug 2016 01:24:29 +0000 (01:24 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev am:
c14748b366 am:
876a98e5ff
am:
63bed4cf99
Change-Id: Ida508af83327563e39cda89410258925819381d8
Erik Kline [Wed, 10 Aug 2016 01:24:26 +0000 (01:24 +0000)]
Handle setting and deprecating local DNS IPv6 addresses am:
fa37b2f613 am:
5fe2c0379f
am:
a852f032fb
Change-Id: Idf650b5f6cfbbee607594c70b1de5cd3f1375a44
Dianne Hackborn [Wed, 10 Aug 2016 01:24:23 +0000 (01:24 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev am:
75cdd5f68f am:
9248b200f7
am:
233a9c4825
Change-Id: Ia5857b0e05ab76dafd97bb4fd17cd850b83a34da
Dianne Hackborn [Wed, 10 Aug 2016 01:24:20 +0000 (01:24 +0000)]
Fix issue #
30766518: Document what targeting N does am:
b34cbedb4e am:
3a585b86be
am:
22fdbab5d0
Change-Id: Ic9beb458f4332b9ec72c4b4b4178a5bce1fcac82
Ruben Brunk [Wed, 10 Aug 2016 01:16:00 +0000 (01:16 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev
am:
8d84bc861f
Change-Id: Ie52a81999359574e2c0cff826ae62bc3b7dc247f
Ruben Brunk [Wed, 10 Aug 2016 01:15:58 +0000 (01:15 +0000)]
Fix setVrThread's exception handling.
am:
83ea55a9c6
Change-Id: Ib2c9df68c2352efe21ebb9d8f2d6997afadd492f
Erik Kline [Wed, 10 Aug 2016 01:15:40 +0000 (01:15 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev am:
c14748b366
am:
876a98e5ff
Change-Id: Ic82a1715c7bd31b149a326f6fc56818879e76f1a
Erik Kline [Wed, 10 Aug 2016 01:15:36 +0000 (01:15 +0000)]
Handle setting and deprecating local DNS IPv6 addresses am:
fa37b2f613
am:
5fe2c0379f
Change-Id: I1bb62c8b1233187d209d65fbcf07c4ce289c72c5
Dianne Hackborn [Wed, 10 Aug 2016 01:15:31 +0000 (01:15 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev am:
75cdd5f68f
am:
9248b200f7
Change-Id: I4aeb23693a40f27d0e28d00b6b489a6db741cfd6
Dianne Hackborn [Wed, 10 Aug 2016 01:15:25 +0000 (01:15 +0000)]
Fix issue #
30766518: Document what targeting N does am:
b34cbedb4e
am:
3a585b86be
Change-Id: I72821636543c9c31da4c6a8ac6d77a8de5d78d1f
TreeHugger Robot [Wed, 10 Aug 2016 01:04:54 +0000 (01:04 +0000)]
Merge "Checking for storage space before adding user"
Jin Park [Tue, 9 Aug 2016 02:48:39 +0000 (11:48 +0900)]
ExifInterface: Remove AssetInputStream dependency
ExifInterface calls native method to retrieve thumbnail data from an
AssetInputStream data. This CL removes that dependecy.
Bug:
29409358
Change-Id: I890b0e813733a5dcaa5480ee48e68c63fc079114
Jin Seok Park [Wed, 10 Aug 2016 01:00:47 +0000 (01:00 +0000)]
Merge "ExifInterface: Fix function for image size update"
Erik Kline [Wed, 10 Aug 2016 01:00:32 +0000 (10:00 +0900)]
Fix up some comments in IPv6 tethering code.
Bug:
30298058
Change-Id: Icc99e772898b8303d8f2f8521784e2cb5c2afacc
Ruben Brunk [Wed, 10 Aug 2016 00:59:26 +0000 (00:59 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev
Erik Kline [Wed, 10 Aug 2016 00:58:03 +0000 (00:58 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev
am:
c14748b366
Change-Id: I43a8576a8aabc30f447caa062c3730b2160aec6b
Erik Kline [Wed, 10 Aug 2016 00:58:01 +0000 (00:58 +0000)]
Handle setting and deprecating local DNS IPv6 addresses
am:
fa37b2f613
Change-Id: I36b01b7b0fbed07b4279c7f35af20592248cf11d
Dianne Hackborn [Wed, 10 Aug 2016 00:57:58 +0000 (00:57 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev
am:
75cdd5f68f
Change-Id: I721ca6ee9471b53c6857609241f2f55d7c11e8ee
Dianne Hackborn [Wed, 10 Aug 2016 00:57:54 +0000 (00:57 +0000)]
Fix issue #
30766518: Document what targeting N does
am:
b34cbedb4e
Change-Id: I2d2c45ef1dc9528b2b84778532edebac8a9e7712
Suprabh Shukla [Wed, 10 Aug 2016 00:20:57 +0000 (17:20 -0700)]
Fixing admins not being removed from DpmMockContext
We were not calling setActiveAdmin before calling setDeviceOwner or
setProfileOwner in these tests. They were passing because the admins
were not being properly removed in the first place. The admin is
actually removed from the admin list inside onReceive of the receiver
passed in sendOrderedBroadcastForUser, which was not overridden to call
onReceive in DpmMockContext.
Bug:
30726135
Change-Id: I08cab5821228738196b229a8f885f7488aaafa34
Erik Kline [Wed, 10 Aug 2016 00:47:56 +0000 (00:47 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev
Dianne Hackborn [Wed, 10 Aug 2016 00:45:54 +0000 (00:45 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev
Ruben Brunk [Wed, 10 Aug 2016 00:30:13 +0000 (17:30 -0700)]
Fix setVrThread's exception handling.
Bug:
30746129
Change-Id: I49ee29f12b52c9f9f5f061508c5cc8c89fd1cd11
Jim Miller [Wed, 10 Aug 2016 00:12:25 +0000 (00:12 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev am:
e11059694a am:
a39117959d
am:
1f138d61c9
Change-Id: Ib84fc03fa472e25420bfaeb2cd7779676c44911f
Jim Miller [Wed, 10 Aug 2016 00:12:22 +0000 (00:12 +0000)]
Bind fingerprint when we start authentication am:
837fa7e56d am:
3871272fc6
am:
1b3261902d
Change-Id: I0d974f25f0565b3d2724db4ac78a007324cd5f8a
Selim Cinek [Wed, 10 Aug 2016 00:06:38 +0000 (00:06 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev am:
00a6c2979b am:
cb140ad8dd
am:
6cee00875f
Change-Id: I78feec3bf98e84af7351acbd88187eb1bfd0269a
Selim Cinek [Wed, 10 Aug 2016 00:06:35 +0000 (00:06 +0000)]
Put the affordance launch animation back on the renderthread am:
4ae263c87c am:
4677240e4f
am:
6788566c43
Change-Id: Icbc0834a5a2288250bce11f6ad9d890a83819926
Jim Miller [Wed, 10 Aug 2016 00:06:19 +0000 (00:06 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev am:
e11059694a
am:
a39117959d
Change-Id: I49dfe17253201e29f2ab8380a4cbbb5bc073f0e1
Jim Miller [Wed, 10 Aug 2016 00:06:16 +0000 (00:06 +0000)]
Bind fingerprint when we start authentication am:
837fa7e56d
am:
3871272fc6
Change-Id: I950703c466265ec5e164f6e75772800745579d34
Selim Cinek [Tue, 9 Aug 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev am:
00a6c2979b
am:
cb140ad8dd
Change-Id: Icfe7bcdbcfc5d4799b505182674c38845ae10faf
Selim Cinek [Tue, 9 Aug 2016 23:59:18 +0000 (23:59 +0000)]
Put the affordance launch animation back on the renderthread am:
4ae263c87c
am:
4677240e4f
Change-Id: Ifeb8a03fd0b7fdf05218080cd00b5d00fbb33c73
Jim Miller [Tue, 9 Aug 2016 23:58:13 +0000 (23:58 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev
am:
e11059694a
Change-Id: I2aaaecd00927ea1dd00ad9a493f5c58a3bc4ddf6
Jim Miller [Tue, 9 Aug 2016 23:58:11 +0000 (23:58 +0000)]
Bind fingerprint when we start authentication
am:
837fa7e56d
Change-Id: Id2e84b60102653598e6d459e83835739b57ef404
Evan Rosky [Tue, 9 Aug 2016 19:43:33 +0000 (12:43 -0700)]
Add UI-disabled tests for UserController
Added dispatchUserSwitchComplete and failedStartUserInForeground tests
to make sure that WM.setSwitchingUser is called appropriately.
Also set the default for UserSwitchUIEnabled to true.
Bug:
30751014
Change-Id: I9143178cb5da49c0c9524560e9fca2ab6f0d2b00
Selim Cinek [Tue, 9 Aug 2016 23:52:29 +0000 (23:52 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev
am:
00a6c2979b
Change-Id: I2430bd0bee50ed7087c59b1ebce873e3094d5451
Selim Cinek [Tue, 9 Aug 2016 23:52:27 +0000 (23:52 +0000)]
Put the affordance launch animation back on the renderthread
am:
4ae263c87c
Change-Id: I675c8a8a4403de9f735e39b03bf185678a601c3c
TreeHugger Robot [Tue, 9 Aug 2016 23:50:40 +0000 (23:50 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev
Makoto Onuki [Tue, 9 Aug 2016 23:46:05 +0000 (23:46 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev am:
a63469076e am:
dabb164cc2
am:
a37443aa3b
Change-Id: I2381299daf1c6369e9a26e9ce4d582df681921d1
Makoto Onuki [Tue, 9 Aug 2016 23:46:02 +0000 (23:46 +0000)]
Rescan apps after restore and re-publish manifest shortcuts am:
377b7970ad am:
51aec5dce5
am:
88223473e5
Change-Id: I26c47df340d751a4234b58fe27e3a1169e7010fb
Raph Levien [Tue, 9 Aug 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Update lint check to accommodate new emoji sequences"
Doris Ling [Tue, 9 Aug 2016 23:41:51 +0000 (23:41 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback"
Selim Cinek [Tue, 9 Aug 2016 23:41:35 +0000 (23:41 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev
Makoto Onuki [Tue, 9 Aug 2016 23:39:39 +0000 (23:39 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev am:
a63469076e
am:
dabb164cc2
Change-Id: I7c41066da3f8a39269329729652127499402cdd9
Makoto Onuki [Tue, 9 Aug 2016 23:39:32 +0000 (23:39 +0000)]
Rescan apps after restore and re-publish manifest shortcuts am:
377b7970ad
am:
51aec5dce5
Change-Id: I02d66c041639a4a9b7fa982c36fcc90d83ecc27e
Makoto Onuki [Tue, 9 Aug 2016 23:34:02 +0000 (23:34 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev
am:
a63469076e
Change-Id: Icd75a843474dd613412cbc3cc083908f96fb54d0
Makoto Onuki [Tue, 9 Aug 2016 23:33:59 +0000 (23:33 +0000)]
Rescan apps after restore and re-publish manifest shortcuts
am:
377b7970ad
Change-Id: I2da62270e106408a7fec91d7442c239457be3d04
TreeHugger Robot [Tue, 9 Aug 2016 23:22:40 +0000 (23:22 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev
Chong Zhang [Tue, 9 Aug 2016 22:48:09 +0000 (22:48 +0000)]
Merge "Put activity into stopped state if recreated while stopped"
Chong Zhang [Tue, 9 Aug 2016 19:57:38 +0000 (12:57 -0700)]
Put activity into stopped state if recreated while stopped
Move handling of recreate from client side to AMS, so that relaunch
happens at the right condition and activity goes to right state
after it's relaunched.
bug:
30060825
Change-Id: Ia475c26927b305eb25ae12be8640aab1fb7677a0
Erik Wolsheimer [Tue, 9 Aug 2016 22:12:02 +0000 (22:12 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am:
002dd29764 am:
c327afa0df
am:
97e9bd749c
Change-Id: I471e5bb6b455a75af953872669e111ba7f100155
Erik Wolsheimer [Tue, 9 Aug 2016 22:11:57 +0000 (22:11 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked am:
b2b3b64417 am:
d491a974c1
am:
2c4a6f5ccd
Change-Id: Id5cb7e86d5b798c66901208e257b0e0835526fe2
Alexandria Cornwall [Tue, 9 Aug 2016 22:07:58 +0000 (22:07 +0000)]
Merge "AAPT2: Merge binary XML file attributes"
Erik Wolsheimer [Tue, 9 Aug 2016 22:04:15 +0000 (22:04 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am:
002dd29764
am:
c327afa0df
Change-Id: I80cb7201377288d43ff9d02367f8e6917de3639f
OSDN Git Service
