OSDN Git Service
Chong Zhang [Wed, 1 Jun 2016 23:12:17 +0000 (23:12 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev am:
65f1973ba9
am:
47797a7653
* commit '
47797a765327af3d3688b6993d85e727ddcf4aa0':
Do not sanitize override config for fullscreen
Change-Id: Ib531f36a2526d4d7b2f3c09ece16ca0bb745447f
Dianne Hackborn [Wed, 1 Jun 2016 23:12:13 +0000 (23:12 +0000)]
Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev am:
61721ee3d7
am:
56b70d51f4
* commit '
56b70d51f45ecf101222d90a993f6f6da044ae65':
Fix issue #
29058724: Improve JobScheduler API demo
Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f
Dianne Hackborn [Wed, 1 Jun 2016 23:12:07 +0000 (23:12 +0000)]
Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am:
3e05055af7
am:
0acb155338
* commit '
0acb155338f8eec7f15069e5133519a6ad31a00f':
Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController
Change-Id: I74edc775e4fce077a7d4a933d6c025b9398db5fb
Selim Cinek [Wed, 1 Jun 2016 23:09:53 +0000 (23:09 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am:
42621023cf
am:
7b7b17ab80
* commit '
7b7b17ab804b81b9dac709012e2e40aa128430ec':
Fixes a few bugs on the keyguard with font density changes
Change-Id: Ief94128ae895fdfadb4aab3ea1d03f12a4257d7f
Felipe Leme [Wed, 1 Jun 2016 23:09:47 +0000 (23:09 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am:
31e3b14d6a
am:
9a1dfc9dab
* commit '
9a1dfc9dabdb69a2100448af43a72a02eeee411e':
Change-Id: Id84838ce714853f1ac200c11bae2f994a0ac1459
Jorim Jaggi [Wed, 1 Jun 2016 23:09:38 +0000 (23:09 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am:
13d534e7f2
am:
a036c209db
* commit '
a036c209db568bb0e0a962f58e1edb0cb628f09d':
Change-Id: I99a1ca15d0df084bfbed8c95bf322e48e59f532e
Eric Schmidt [Wed, 1 Jun 2016 23:09:29 +0000 (23:09 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a am:
28ed18877b
am:
7ed7f324f6
* commit '
7ed7f324f69712175f8ede8d2504fa28269f0060':
Change-Id: Ida1d4582b66e65ccfdd644bec14153f2735871c2
Adrian Roos [Wed, 1 Jun 2016 23:09:18 +0000 (23:09 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev am:
b4cd4650cf
am:
2bad55cb1b
* commit '
2bad55cb1b90a0154a32f4fecf75fe14fd9e8744':
Change-Id: Ia127442c7441efdbcbde2065fbd87ecc75263246
Android Build Merger (Role) [Wed, 1 Jun 2016 23:05:14 +0000 (23:05 +0000)]
Merge "Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am:
31e3b14d6a am:
d116e0fc14" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:05:04 +0000 (23:05 +0000)]
Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am:
13d534e7f2 am:
859465c105" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:54 +0000 (23:04 +0000)]
Merge "Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a am:
28ed18877b am:
65436b097a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:22 +0000 (23:04 +0000)]
Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am:
b4cd4650cf am:
62eb79e6c8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:08 +0000 (23:04 +0000)]
Merge "cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37 am:
b04f86acae am:
8b1df8f382" into nyc-mr1-dev-plus-aosp
Felipe Leme [Wed, 1 Jun 2016 23:02:47 +0000 (23:02 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am:
31e3b14d6a
am:
d116e0fc14
* commit '
d116e0fc1447470a1d7ca1d6f25f56b4e598f996':
Move DownloadsManager to permanent whitelist.
Change-Id: Icbe617b4a5f894930b15923fe2a104d1957bb17a
Jorim Jaggi [Wed, 1 Jun 2016 23:02:11 +0000 (23:02 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am:
13d534e7f2
am:
859465c105
* commit '
859465c105215cc7d0e152ad2280419c4f820598':
Don't crash activity manager when supplying invalid URI
Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d
Eric Schmidt [Wed, 1 Jun 2016 23:02:01 +0000 (23:02 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a am:
28ed18877b
am:
65436b097a
* commit '
65436b097a9e513d8628ed3cfa187de226a75efb':
docs: Fixed 'MessageStyle' typo
Change-Id: If678f140004aa846bc83c2a2aefbfd428dc9123d
Adrian Roos [Wed, 1 Jun 2016 23:01:55 +0000 (23:01 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev am:
b4cd4650cf
am:
62eb79e6c8
* commit '
62eb79e6c80960636982d056c89b97a0c95d9987':
AppError: Change "close" to "close app"
Change-Id: Ib622156c3af13a6cec611f2613f0729b839ed3db
Kevin Hufnagle [Wed, 1 Jun 2016 23:01:46 +0000 (23:01 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37 am:
b04f86acae
am:
8b1df8f382
* commit '
8b1df8f3825c3f80b6151265be106e21591843ef':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: I6076f1c21cee15def105a503469e0c5207cfa87f
Kevin Hufnagle [Wed, 1 Jun 2016 22:56:38 +0000 (22:56 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37 am:
b04f86acae
am:
810913f943
* commit '
810913f943004211313f8b2338508865a67df4f1':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Ia16f73bf25261d7ea842c6b615dcc9c04ffe06a6
Julia Reynolds [Wed, 1 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev am:
d05a7b5972
am:
9eaa3bc7a8
* commit '
9eaa3bc7a806081d0bfc39cae0e61dbce581da54':
Change-Id: I0f33d6db53ffa344e3a25b42a402c39fad2c12fb
Ian Rogers [Wed, 1 Jun 2016 22:56:30 +0000 (22:56 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev am:
748620e9f0
am:
ecc799a076
* commit '
ecc799a0761f60237bcd6da516e32a28f5951b5a':
Change-Id: If26f115ccd0661536afced9165fcc149d62d3946
Jason Monk [Wed, 1 Jun 2016 22:56:25 +0000 (22:56 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev am:
4215ae0100
am:
937e0e3e61
* commit '
937e0e3e61dcf9cef1de92d6fb80bb5491f88489':
Change-Id: I0d6d2ae4b6f2ca962c55eccdacb4ec17df00ff77
Jason Monk [Wed, 1 Jun 2016 22:56:20 +0000 (22:56 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev am:
1ceef7c0fa
am:
13edc468d6
* commit '
13edc468d6ac2a8ac2ccafcd06053af883a248f6':
Change-Id: I2ca7c1e8739e218cae4336039f43fd829ed39906
Julia Reynolds [Wed, 1 Jun 2016 22:52:08 +0000 (22:52 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev am:
d05a7b5972
am:
88470b5ba2
* commit '
88470b5ba2aeb38ff5d8d25b17b9897ed1efa5cd':
Radio buttons belong in a radio group.
Change-Id: I17cbb329efa9cb1fc7a3a229cd523ce0abab852f
Ian Rogers [Wed, 1 Jun 2016 22:52:02 +0000 (22:52 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev am:
748620e9f0
am:
e3cac08ec6
* commit '
e3cac08ec62973b1d92c7f02ea291eb96f4fe93a':
Fix call to equals that could never succeed.
Change-Id: I5fa03a7d9cfa6e3c8ef2feb04838df3023b7aaae
Jason Monk [Wed, 1 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev am:
4215ae0100
am:
023b338111
* commit '
023b338111191c62cb5ba6b4a3394fe039c0888e':
QS: Fix single expanded frame from layout
Change-Id: I3e2035596f207b7ed82973af91470ca981bb65ef
Jason Monk [Wed, 1 Jun 2016 22:51:49 +0000 (22:51 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev am:
1ceef7c0fa
am:
947ef9a717
* commit '
947ef9a7171fa0750cf3c027a2cb487f827cff06':
QS: Followup to scroll fixes
Change-Id: I62212b21a330db50aaa8a2923bf753e980f931cf
Robert Shih [Wed, 1 Jun 2016 22:51:43 +0000 (22:51 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
d579be0cf2
am:
0c4f066f0b
* commit '
0c4f066f0b043e6b2678840a7da1db2714abd2d9':
Change-Id: I80d858b02b023abae4e1aa79f8a2bd5040073738
Chong Zhang [Wed, 1 Jun 2016 22:49:08 +0000 (22:49 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev
am:
65f1973ba9
* commit '
65f1973ba9f91c6727a7131b31b6c563cd880ee0':
Do not sanitize override config for fullscreen
Change-Id: Ic9c62b12f529e17c39ac7f466433cb30cb13f356
Dianne Hackborn [Wed, 1 Jun 2016 22:48:59 +0000 (22:48 +0000)]
Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev
am:
61721ee3d7
* commit '
61721ee3d7b7d55a0535584449b49143b1c2e039':
Fix issue #
29058724: Improve JobScheduler API demo
Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d
Dianne Hackborn [Wed, 1 Jun 2016 22:48:52 +0000 (22:48 +0000)]
Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev
am:
3e05055af7
* commit '
3e05055af775f9539d832b1191ae2ee9bc4acf21':
Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController
Change-Id: I8e472de1aca491dabd1bd2bfc456560fabc16221
Selim Cinek [Wed, 1 Jun 2016 22:45:59 +0000 (22:45 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
am:
42621023cf
* commit '
42621023cfac084b8c74fd4d362bc2c64d61674e':
Fixes a few bugs on the keyguard with font density changes
Change-Id: Ic871ddca73896db588ca8436c2aea92c50eb37aa
Felipe Leme [Wed, 1 Jun 2016 22:45:33 +0000 (22:45 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am:
31e3b14d6a
* commit '
31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
Move DownloadsManager to permanent whitelist.
Change-Id: I2d36bc51ff244a0890824e376602f22baa0c4b7b
Jorim Jaggi [Wed, 1 Jun 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am:
13d534e7f2
* commit '
13d534e7f2419219e3e26e582b1f6f5ae79be408':
Don't crash activity manager when supplying invalid URI
Change-Id: Iddb17cdf953668ad8bfae6a54a5eb9141ec12ad2
Eric Schmidt [Wed, 1 Jun 2016 22:44:58 +0000 (22:44 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a
am:
28ed18877b
* commit '
28ed18877bc9cc040e8cea678f7a7782426c1dc9':
docs: Fixed 'MessageStyle' typo
Change-Id: Iff30a4c4e9c9b45939d780aebe34ac74bdfb5f8d
Adrian Roos [Wed, 1 Jun 2016 22:44:44 +0000 (22:44 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
am:
b4cd4650cf
* commit '
b4cd4650cfd634df75e9e23f9585a756823bd012':
AppError: Change "close" to "close app"
Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13
Kevin Hufnagle [Wed, 1 Jun 2016 22:26:19 +0000 (22:26 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37
am:
b04f86acae
* commit '
b04f86acae9f5a0101e997a2dde08342c92b180f':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Id5b9ffebcafb4035b6d330e9aae0d65a09a282e2
Julia Reynolds [Wed, 1 Jun 2016 22:24:21 +0000 (22:24 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am:
d05a7b5972
* commit '
d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
Radio buttons belong in a radio group.
Change-Id: Ia5b4cd5135fb78ccf98f1b05e63fafc7a04349d8
Ian Rogers [Wed, 1 Jun 2016 22:20:47 +0000 (22:20 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am:
748620e9f0
* commit '
748620e9f03dd66bfed38d91d32b35d79684173b':
Fix call to equals that could never succeed.
Change-Id: I27b594ae75430b5cb9fe3bc905461b547ba5841c
Jason Monk [Wed, 1 Jun 2016 22:20:22 +0000 (22:20 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am:
4215ae0100
* commit '
4215ae01002f1217587698d24636870ace4a50f5':
QS: Fix single expanded frame from layout
Change-Id: I49972e1a12bf6eeec91e845550c81a7eb41a0ecc
Jason Monk [Wed, 1 Jun 2016 22:20:16 +0000 (22:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I7a0a3962cd1efef365787cb25aa70b77c6b403bf
Robert Shih [Wed, 1 Jun 2016 22:18:00 +0000 (22:18 +0000)]
resolve merge conflicts of
d579be0 to nyc-dev-plus-aosp
am:
4c3d43d2c2
* commit '
4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: I8e0bfa7f23437ba3fe75283d6020b446ea82d55c
Robert Shih [Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)]
resolve merge conflicts of
d579be0 to nyc-dev-plus-aosp
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
Chong Zhang [Wed, 1 Jun 2016 19:34:02 +0000 (19:34 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:29:41 +0000 (19:29 +0000)]
Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:26:07 +0000 (19:26 +0000)]
Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev
Chong Zhang [Wed, 1 Jun 2016 19:20:10 +0000 (12:20 -0700)]
Do not sanitize override config for fullscreen
bug:
29063336
Change-Id: I65c5d635133a6b3791ce1aef63547f8d38ca24b5
Vasco Brito [Wed, 1 Jun 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am:
56bd06fc3e am:
ce82f1c16a
am:
be718d8836
* commit '
be718d8836e85b8bff0de83e4fefbd92675c0855':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: Ie1371d5dd1458038a2a2a93bba7c2e45f1d671ea
Robert Greenwalt [Wed, 1 Jun 2016 19:07:45 +0000 (19:07 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am:
56bd06fc3e
am:
ce82f1c16a
* commit '
ce82f1c16a4c10e003a11020fcb3c232010c40c6':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3
Selim Cinek [Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
Felipe Leme [Wed, 1 Jun 2016 18:59:23 +0000 (18:59 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am:
31e3b14d6a
* commit '
31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
Move DownloadsManager to permanent whitelist.
Change-Id: Ia13db0b6db0995047353a9453d9132bcb4e9b34b
Vasco Brito [Wed, 1 Jun 2016 18:51:28 +0000 (18:51 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
am:
56bd06fc3e
* commit '
56bd06fc3e29290ba90b792a7f7353864cbf772a':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68
Jorim Jaggi [Wed, 1 Jun 2016 18:50:23 +0000 (18:50 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am:
13d534e7f2
* commit '
13d534e7f2419219e3e26e582b1f6f5ae79be408':
Don't crash activity manager when supplying invalid URI
Change-Id: I1f87d39822fe9a938b511a2b55fda2338311290e
TreeHugger Robot [Wed, 1 Jun 2016 18:49:41 +0000 (18:49 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev
Eric Schmidt [Wed, 1 Jun 2016 18:36:44 +0000 (18:36 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a
am:
28ed18877b
* commit '
28ed18877bc9cc040e8cea678f7a7782426c1dc9':
docs: Fixed 'MessageStyle' typo
Change-Id: I784af12e3d721d4af9fa747e794677c17b7434f6
Adrian Roos [Wed, 1 Jun 2016 18:27:55 +0000 (18:27 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
am:
b4cd4650cf
* commit '
b4cd4650cfd634df75e9e23f9585a756823bd012':
AppError: Change "close" to "close app"
Change-Id: I8d4a7a2517321551a057776ecf30dc35c6168e4d
Eric Schmidt [Wed, 1 Jun 2016 18:25:35 +0000 (18:25 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246
am:
51500a1c5a
* commit '
51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
docs: Fixed 'MessageStyle' typo
Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
Kevin Hufnagle [Wed, 1 Jun 2016 18:19:48 +0000 (18:19 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37
am:
b04f86acae
* commit '
b04f86acae9f5a0101e997a2dde08342c92b180f':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Id72cdfad947a1a8d15cd190de8604f76fbf5a866
Eric Schmidt [Wed, 1 Jun 2016 18:16:17 +0000 (18:16 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am:
8ef79a9246
* commit '
8ef79a9246eba129c22e5d54654ecb85414edf22':
docs: Fixed 'MessageStyle' typo
Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Adrian Roos [Wed, 1 Jun 2016 18:14:41 +0000 (18:14 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
Kevin Hufnagle [Wed, 1 Jun 2016 18:10:43 +0000 (18:10 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185
am:
f5250c5b37
* commit '
f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
Julia Reynolds [Wed, 1 Jun 2016 18:07:18 +0000 (18:07 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am:
d05a7b5972
* commit '
d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
Radio buttons belong in a radio group.
Change-Id: If12173e67797ba105ea40475e3ad9e3061d592f9
Eric Schmidt [Wed, 1 Jun 2016 18:04:55 +0000 (18:04 +0000)]
Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs
Kevin Hufnagle [Wed, 1 Jun 2016 18:02:22 +0000 (18:02 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest.
am:
d5368b8185
* commit '
d5368b81857a04879ed55be2a67f034cce4e5094':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
TreeHugger Robot [Wed, 1 Jun 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 17:55:13 +0000 (10:55 -0700)]
Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController
Make sure the core parts of JobSchedulerService are initialized
before we start creating the controllers.
Change-Id: I497df12f7e6fbd93581291ec691c4b45104d67d0
Ian Rogers [Wed, 1 Jun 2016 17:54:22 +0000 (17:54 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am:
748620e9f0
* commit '
748620e9f03dd66bfed38d91d32b35d79684173b':
Fix call to equals that could never succeed.
Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
Dianne Hackborn [Wed, 1 Jun 2016 17:48:43 +0000 (10:48 -0700)]
Fix issue #
29058724: Improve JobScheduler API demo
We can now include it in the java docs!
Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
TreeHugger Robot [Wed, 1 Jun 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 17:39:06 +0000 (17:39 +0000)]
Merge "Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1 am:
93a01103af" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:52 +0000 (17:38 +0000)]
Merge "Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713 am:
ae42c4a118" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:40 +0000 (17:38 +0000)]
Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30 am:
2891acd139" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:23 +0000 (17:38 +0000)]
Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f am:
adc3f1ec2b" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 1 Jun 2016 17:37:49 +0000 (17:37 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am:
4215ae0100
* commit '
4215ae01002f1217587698d24636870ace4a50f5':
QS: Fix single expanded frame from layout
Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
Brian Carlstrom [Wed, 1 Jun 2016 17:37:42 +0000 (17:37 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1
am:
93a01103af
* commit '
93a01103afae6bfada5a7b8decd96c2e3af0448b':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I6306780a19f729114a5134281a088f106159d7db
Jason Monk [Wed, 1 Jun 2016 17:37:37 +0000 (17:37 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713
am:
ae42c4a118
* commit '
ae42c4a1181a304039e425dbc6c0c2d12a31b0b9':
QS: Only put visible tiles in listening state
Change-Id: I62885fc401c4676226e4ff9d3a41d15664c8b75b
Jason Monk [Wed, 1 Jun 2016 17:37:31 +0000 (17:37 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30
am:
2891acd139
* commit '
2891acd139d0db993df975a97f953a194d5c0db2':
QS: Protect against crash with no icon
Change-Id: I10bb822408d59d228d5b28bdc77f8581941cbe11
Adrian Roos [Wed, 1 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
adc3f1ec2b
* commit '
adc3f1ec2b8b85d1b3ced34e424e1b091f937b03':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I68a1cc476055a7fe28cb9f5157dfc0362de7c9bd
Brian Carlstrom [Wed, 1 Jun 2016 17:34:51 +0000 (17:34 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1
am:
41846b0612
* commit '
41846b061226af72eaffbdea4dc44fa2bbd087b1':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I524bf5934835d10d42dec63bacd52cd1bacda96d
Jason Monk [Wed, 1 Jun 2016 17:34:33 +0000 (17:34 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713
am:
e696c8465b
* commit '
e696c8465b599fdbc560ec18a7497f90d0a3efbe':
QS: Only put visible tiles in listening state
Change-Id: If91dcf13524c6d63cf99946639163c45bae15739
Jason Monk [Wed, 1 Jun 2016 17:34:18 +0000 (17:34 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30
am:
a58c1a52ac
* commit '
a58c1a52ac44a53175475f78cea074583ed5e177':
QS: Protect against crash with no icon
Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115
Adrian Roos [Wed, 1 Jun 2016 17:34:05 +0000 (17:34 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
72bc1299f2
* commit '
72bc1299f2020c4acd51defed6da430d61edc5fa':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
Jason Monk [Wed, 1 Jun 2016 17:27:21 +0000 (17:27 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
Jason Monk [Wed, 1 Jun 2016 17:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:26:22 +0000 (17:26 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: Ic765c13a476c0924d2ede278b379db86d634fa1f
Jason Monk [Wed, 1 Jun 2016 17:26:14 +0000 (17:26 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I361a2ad640505ec2b1f10adb31e41aea0daced4e
Jason Monk [Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
Adrian Roos [Wed, 1 Jun 2016 17:25:52 +0000 (17:25 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am:
ff39d3ec2f
* commit '
ff39d3ec2fa773a50bbd069a40570767c80fd404':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2
Android Build Merger (Role) [Wed, 1 Jun 2016 17:22:32 +0000 (17:22 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
c123c0b4d0" into nyc-mr1-dev-plus-aosp
Mady Mellor [Wed, 1 Jun 2016 17:21:58 +0000 (17:21 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28
am:
c123c0b4d0
* commit '
c123c0b4d02e948757e825e4f8249391afd45e3f':
Change-Id: I6c21ac599c286db2f84a399a61613d2d7d6ca16a
Narayan Kamath [Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
d579be0cf2
* commit '
d579be0cf234a35273f79676c102b8bd80e071dc':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1
Benjamin Franz [Wed, 1 Jun 2016 17:20:43 +0000 (17:20 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
am:
3c826b160c
* commit '
3c826b160c724d38f49bb479aa13ab8cf685e2d2':
Add an intent extra to force master clear
Change-Id: I5789ac49b040ba6b1330e9680c1a595f24e82af9
Jason Monk [Wed, 1 Jun 2016 17:20:16 +0000 (17:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
Robert Shih [Wed, 1 Jun 2016 17:16:59 +0000 (17:16 +0000)]
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 17:14:58 +0000 (17:14 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
8c475d5b0a" into nyc-mr1-dev-plus-aosp
Narayan Kamath [Wed, 1 Jun 2016 17:14:59 +0000 (17:14 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I1eddbe894b3f4a2583973a98f3dc0d8adf8af16c
Jason Monk [Wed, 1 Jun 2016 17:14:54 +0000 (17:14 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I437e2841841d6b54ba5c747052a885109b7e8bc4
Jason Monk [Wed, 1 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
OSDN Git Service
