OSDN Git Service
Christopher Tate [Tue, 11 Oct 2016 03:06:05 +0000 (03:06 +0000)]
Ignore wallpaper relaunch timeout during shutdown
am:
762dfd1566
Change-Id: I824dd66b4a9d30c010112038156146750275cb89
Christopher Tate [Tue, 11 Oct 2016 00:44:48 +0000 (17:44 -0700)]
Ignore wallpaper relaunch timeout during shutdown
Because of course during system shutdown, the wallpaper service
won't actually get relaunched. Sometimes shutdown can take long
enough that this timeout kicks, so we need to avoid clearing the
live wallpaper state spuriously.
For simplicity we just check at "would have timed out now" time
rather than try to distinguish between the shutdown case and a
genuine crash that raced with the shutdown broadcast.
Bug
32020355
Change-Id: I9335b2c0214b4c750ef950fed157d186aa670176
sergeyv [Tue, 11 Oct 2016 00:43:37 +0000 (00:43 +0000)]
Merge "Turn off additional logging in text rendering" into nyc-mr1-dev
am:
9fe5b1129e
Change-Id: I013fc2d7781c4f17beb9ac99c654bb65880adb6f
sergeyv [Tue, 11 Oct 2016 00:43:32 +0000 (00:43 +0000)]
Turn off additional logging in text rendering
am:
5bb5626599
Change-Id: Ic7f6c59ca2c3a92f81bf55a8916e20d99fcc01a7
TreeHugger Robot [Tue, 11 Oct 2016 00:30:32 +0000 (00:30 +0000)]
Merge "Turn off additional logging in text rendering" into nyc-mr1-dev
Jeff Sharkey [Mon, 10 Oct 2016 23:29:31 +0000 (23:29 +0000)]
Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev
am:
4a021fa541
Change-Id: Ifb15090b906e32305ba1f88aa73067fb791bf520
Jeff Sharkey [Mon, 10 Oct 2016 23:29:28 +0000 (23:29 +0000)]
Set MIME type when building BROWSE intents.
am:
42a4aaab44
Change-Id: I9efdf0e7223b162988f9484b06c7e3665202738f
TreeHugger Robot [Mon, 10 Oct 2016 23:21:32 +0000 (23:21 +0000)]
Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev
Bert McMeen [Mon, 10 Oct 2016 22:19:18 +0000 (22:19 +0000)]
Docs: Remove a reference to a deprecated sample am:
3e01ab2b0e am:
c48ad2580a
am:
e62f577153
Change-Id: Ia43dd95a9ed8b3debcdbea35f9718493378f8929
Junda Liu [Mon, 10 Oct 2016 22:15:24 +0000 (22:15 +0000)]
Merge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev
am:
432157f8bc
Change-Id: Idb9fa2b3376eacabf58350105405219aa75a70b0
Junda Liu [Mon, 10 Oct 2016 22:15:16 +0000 (22:15 +0000)]
Remove incorrect non-roaming list for Telus.
am:
458537483d
Change-Id: I3b6af034ceff722311e9952be4f57e6030d1eb38
Bert McMeen [Mon, 10 Oct 2016 22:10:20 +0000 (22:10 +0000)]
Docs: Remove a reference to a deprecated sample am:
3e01ab2b0e
am:
c48ad2580a
Change-Id: Ic7f79fddf6696346b171e2bb2601e813dc82aa06
Bert McMeen [Mon, 10 Oct 2016 22:05:20 +0000 (22:05 +0000)]
Docs: Remove a reference to a deprecated sample
am:
3e01ab2b0e
Change-Id: Idd2ac6b2c6aa056c88033aa10cd7732d2b343b75
Junda Liu [Mon, 10 Oct 2016 21:58:26 +0000 (21:58 +0000)]
Merge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev
Jeff Sharkey [Mon, 10 Oct 2016 21:26:14 +0000 (15:26 -0600)]
Set MIME type when building BROWSE intents.
If we created a BROWSE PendingIntent early during boot (while the
device was still locked), we would resolve the MIME type as "null"
meaning the intent would fail to launch.
Since we always know what the MIME type will be, set it explicitly.
Test: boot device while USB device attached
Bug:
30742481
Change-Id: I23c523cbe2660ca63a3b7df1f41300ab803b314c
Bert McMeen [Mon, 10 Oct 2016 21:21:00 +0000 (14:21 -0700)]
Docs: Remove a reference to a deprecated sample
Bug:
31709180
Change-Id: Ieec19820b1154628236495541a28b50089c4e0cd
sergeyv [Mon, 10 Oct 2016 19:25:06 +0000 (12:25 -0700)]
Turn off additional logging in text rendering
Change-Id: If5f11489c05e320e4436fb57680857b29228a755
b:
30427106
Lifu Tang [Mon, 10 Oct 2016 19:12:43 +0000 (19:12 +0000)]
Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
am:
9e4733ed33
Change-Id: I8f03a3d36e8836ffc14e9986114b1e3ccb40cc2d
Lifu Tang [Mon, 10 Oct 2016 19:12:38 +0000 (19:12 +0000)]
Fixed the memory leak when receiving Nav messages
am:
fe427f24e5
Change-Id: Iaae06561c8247b2292a10ec24bf3d1a264850ad9
Lifu Tang [Mon, 10 Oct 2016 19:00:07 +0000 (19:00 +0000)]
Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
Jorim Jaggi [Mon, 10 Oct 2016 11:55:18 +0000 (11:55 +0000)]
Merge "Fix dismissing window showing" into nyc-mr1-dev
am:
b29dadb939
Change-Id: If668d9f895845362e171d74dd2c3884c35bf92af
Jorim Jaggi [Mon, 10 Oct 2016 11:55:13 +0000 (11:55 +0000)]
Fix dismissing window showing
am:
f20b1428f8
Change-Id: I58829c0bc567fc3c48e03276075d9256649d84e3
Jorim Jaggi [Mon, 10 Oct 2016 11:46:58 +0000 (11:46 +0000)]
Merge "Fix dismissing window showing" into nyc-mr1-dev
Lifu Tang [Sat, 8 Oct 2016 09:57:53 +0000 (02:57 -0700)]
Fixed the memory leak when receiving Nav messages
Bug:
32038182
Change-Id: Ie659dc945d6efc7feaf9285d3e7375c90cba7234
Doris Liu [Sat, 8 Oct 2016 23:52:20 +0000 (23:52 +0000)]
Support calling start() in onAnimationFinished(...) in AVD
am:
679fe6ab6f
Change-Id: I2999f6fc543f56d73cd03fe74b466c033d6c7d1a
Doris Liu [Fri, 7 Oct 2016 18:09:21 +0000 (11:09 -0700)]
Support calling start() in onAnimationFinished(...) in AVD
This CL fixed an issue where calling start() from onAnimationFinished()
caused AnimationListenerBridge::onAnimationFinished(...) to be unsafely
re-entered and the new start listener was (incorrectly) reset to null.
BUG:
31971397
Test: test apk in the bug linked above
Change-Id: Ica809ef2dab884950b93b54f2d0cb4b81e9830f1
Joe Fernandez [Fri, 7 Oct 2016 22:52:04 +0000 (22:52 +0000)]
docs: add collections for Distribute Stories, Games and Apps am:
d366709268 am:
a424ec21cb
am:
ad81502f20
Change-Id: I3a356a7414dbf70d58fced4b300f10eff5ce5298
Joe Fernandez [Fri, 7 Oct 2016 22:48:01 +0000 (22:48 +0000)]
docs: add collections for Distribute Stories, Games and Apps am:
d366709268
am:
a424ec21cb
Change-Id: Iaebda3b697804c384c9df039ab104d49f0b5ddec
Joe Fernandez [Fri, 7 Oct 2016 22:40:02 +0000 (22:40 +0000)]
docs: add collections for Distribute Stories, Games and Apps
am:
d366709268
Change-Id: I13ac71c0e908a0a7ffd76babe7fcb4e39ff1352e
Wyatt Riley [Fri, 7 Oct 2016 21:13:57 +0000 (21:13 +0000)]
Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
am:
d270004959
Change-Id: I2a63754f83346825bce28f5849fcf53794e64929
Wyatt Riley [Fri, 7 Oct 2016 21:13:54 +0000 (21:13 +0000)]
Removing over-active NTP & XTRA assistance downloads
am:
0d6e54e246
Change-Id: I6d6a151fb7bb13ddabed10aa33f20aec8cefe8a8
Joe Fernandez [Fri, 7 Oct 2016 21:11:49 +0000 (14:11 -0700)]
docs: add collections for Distribute Stories, Games and Apps
b/
31741249
Change-Id: I873ce82f18c5edbdeb85fb2fdb25ba322760a2dc
Wyatt Riley [Fri, 7 Oct 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
Miao Wang [Fri, 7 Oct 2016 20:53:25 +0000 (20:53 +0000)]
Merge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev
am:
35d2d12159
Change-Id: Ia493798c58e9c0411f5d1cf4f217685b388ba2a9
Miao Wang [Fri, 7 Oct 2016 20:53:20 +0000 (20:53 +0000)]
Correctly pass number of input allocations for BLAS
am:
166b402861
Change-Id: I3afae51d6a21b6261fc31696ec0a0072f004275c
TreeHugger Robot [Fri, 7 Oct 2016 20:46:17 +0000 (20:46 +0000)]
Merge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev
Alex Hills [Fri, 7 Oct 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
am:
67c70a263c
Change-Id: I2768146b5921acac69cb42e64d06b11ea5db4eb4
Alex Hills [Fri, 7 Oct 2016 20:43:57 +0000 (20:43 +0000)]
Updates documentation for MessagingStyle constructor
am:
fd590441c1
Change-Id: I341c9a18c5a64e8cb63ad277611b9e55f61047c1
Alan Viverette [Fri, 7 Oct 2016 20:42:52 +0000 (20:42 +0000)]
Merge "Scale bitmap shaders for target density" into nyc-mr1-dev
am:
0f6cec369f
Change-Id: I96ae107012b6f71c23fa7f26d07ac83c3049dcfd
Alan Viverette [Fri, 7 Oct 2016 20:39:48 +0000 (20:39 +0000)]
Scale bitmap shaders for target density
am:
0d2a46b733
Change-Id: I8e3274a9c6047d943336827e7e0c8563e40c2ca5
TreeHugger Robot [Fri, 7 Oct 2016 20:34:48 +0000 (20:34 +0000)]
Merge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
TreeHugger Robot [Fri, 7 Oct 2016 20:30:59 +0000 (20:30 +0000)]
Merge "Scale bitmap shaders for target density" into nyc-mr1-dev
Alan Viverette [Fri, 7 Oct 2016 20:23:32 +0000 (16:23 -0400)]
Scale bitmap shaders for target density
Also fixes progress bar sample tile to reflect density and ensures
that ProgressBar.tileify() clones inner drawables into the correct
density.
Bug:
31841123
Test: BitmapDrawableTest#testPreloadDensity()
Test: ThemeHostTest
Test: Visual inspection of ApiDemos
Change-Id: I9dcb9817d8d91d61ff0215987247e9e7fb089c46
Rob Carr [Fri, 7 Oct 2016 19:21:54 +0000 (19:21 +0000)]
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev
am:
93becf5148
Change-Id: I8c796189cb90219ba21195e6d1a1e227a3d88051
Robert Carr [Fri, 7 Oct 2016 19:21:51 +0000 (19:21 +0000)]
When adding dialog window but not creating update the configuration.
am:
d7dbec7e4c
Change-Id: I137783f64cec9f9134e1c66b123993d65397deb5
Miao Wang [Thu, 6 Oct 2016 17:45:42 +0000 (10:45 -0700)]
Correctly pass number of input allocations for BLAS
Bug:
31992305
Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
(cherry picked from commit
b742fcc808165fbeeb1a48761e7d629f60207de2)
Rob Carr [Fri, 7 Oct 2016 19:16:00 +0000 (19:16 +0000)]
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev
Jim Miller [Fri, 7 Oct 2016 18:52:49 +0000 (18:52 +0000)]
Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev
am:
aea8efbc11
Change-Id: I0a8e6a0ad2f7d0b28dc668bab9bed6928b871620
Jim Miller [Fri, 7 Oct 2016 18:52:45 +0000 (18:52 +0000)]
Allow sysui navigation to work when application occludes keyguard
am:
69c1241d3b
Change-Id: I533b955e86cab04d9b57c08d1f162671f374f5c2
Jim Miller [Fri, 7 Oct 2016 18:43:58 +0000 (18:43 +0000)]
Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev
Nancy Zheng [Fri, 7 Oct 2016 17:47:44 +0000 (17:47 +0000)]
Merge "Fix race condition in checkPattern and verifyPattern." into cw-f-dev
Nancy Zheng [Fri, 7 Oct 2016 17:41:00 +0000 (10:41 -0700)]
Fix race condition in checkPattern and verifyPattern.
Bug:
31939282
Change-Id: I3250ab900f190ca9c820ac355ce94a699315b137
Jason Monk [Fri, 7 Oct 2016 17:17:16 +0000 (17:17 +0000)]
Merge "Revert "Revert "Change bang to x for indication of no internet""" into nyc-mr1-dev
am:
b04790c8d4
Change-Id: I9f1cef400799409fab93f2e29aac96bd2cd6e079
Jason Monk [Fri, 7 Oct 2016 17:17:13 +0000 (17:17 +0000)]
Revert "Revert "Change bang to x for indication of no internet""
am:
d51608c60b
Change-Id: I263a0d51474bbf7ef170d851b724f98deb828163
TreeHugger Robot [Fri, 7 Oct 2016 17:11:58 +0000 (17:11 +0000)]
Merge "Revert "Revert "Change bang to x for indication of no internet""" into nyc-mr1-dev
Alex Hills [Fri, 7 Oct 2016 13:52:44 +0000 (09:52 -0400)]
Updates documentation for MessagingStyle constructor
MessagingStyle expects the field userReplyName to be non-null, but the
documentation doesn't describe it as such. This updates the documentation
to say the field is required, and adds a NonNull annotation.
This has no behavior changes.
BUG:
31747744
Change-Id: If832d059c276e856fba366dabfa8a5821bb63054
Jorim Jaggi [Mon, 3 Oct 2016 14:33:56 +0000 (16:33 +0200)]
Fix dismissing window showing
Only show dismissing window if we are about to unlock, and not just
in all cases. For that, set a flag to true during the process, and
reset the flag after the Keyguard has unlocked.
Test: Have a FLAG_SHOW_WHEN_LOCKED activity that starts a
FLAG_DISMISS_KEYGUARD_ACTIVITY. Check whether window is hidden
when toggling the power button. Make sure that the device is
in a trusted state during the whole test.
Change-Id: I9346dd869d1cf50a42c64a5f7c69f8e24f1e1f9b
Fixes:
31810884
Todd Kennedy [Fri, 7 Oct 2016 14:45:31 +0000 (14:45 +0000)]
Merge "Force APKs to be streamed" into nyc-dev am:
dd100f4298 am:
bafabbe4b9
am:
83410b7f31
Change-Id: I3b4a7351dc9e1052a590f610dd6b769ba297667a
Todd Kennedy [Fri, 7 Oct 2016 14:44:35 +0000 (14:44 +0000)]
Force APKs to be streamed am:
d220683d33 am:
e119cccce0
am:
b69ce459aa
Change-Id: Ifa3f48c38b394ca0db339e9b6e1141750f65f412
Todd Kennedy [Fri, 7 Oct 2016 14:37:17 +0000 (14:37 +0000)]
Merge "Force APKs to be streamed" into nyc-dev am:
dd100f4298
am:
bafabbe4b9
Change-Id: I0ff901eb1b123a21a425072439c8be9dcd66ae6a
Todd Kennedy [Fri, 7 Oct 2016 14:36:31 +0000 (14:36 +0000)]
Force APKs to be streamed am:
d220683d33
am:
e119cccce0
Change-Id: I196c12c3b6ebf33f6ff72abde72f67dd864c1eaf
Todd Kennedy [Fri, 7 Oct 2016 14:29:06 +0000 (14:29 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
am:
dd100f4298
Change-Id: Ic1904dab79ee0cccdc1aace7eca89d9a6cb48f4f
Todd Kennedy [Fri, 7 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Force APKs to be streamed
am:
d220683d33
Change-Id: I617a4854f406dbdacf3b150df0bd72793112d95c
TreeHugger Robot [Fri, 7 Oct 2016 14:21:26 +0000 (14:21 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
Jason Monk [Fri, 7 Oct 2016 13:15:24 +0000 (13:15 +0000)]
Revert "Revert "Change bang to x for indication of no internet""
This reverts commit
ed29365c9e169dbf05857bf9ca5125175a6dbe44.
Fixes:
31978991
Change-Id: I7554efc6877b100e4238178fd2029909518be3bb
Jakub Adamek [Fri, 7 Oct 2016 10:53:39 +0000 (11:53 +0100)]
Adding minimal customizable background colour support.
This adds back minimal support from
https://googleplex-android-review.googlesource.com/#/c/
1442940/1
because the bigger thing had to be reverted.
Bug:
31459804
Change-Id: I545d1f7639c9dada417e95b5da6290414d3de05d
Jakub Adamek [Fri, 7 Oct 2016 10:27:57 +0000 (11:27 +0100)]
Revert "Adding customizable background colour support."
This reverts commit
eedebc4850749ba8a7a70e17a41399997806856a.
This needs to be submitted only with the next change which re-adds
minimal support.
Change-Id: I1f269a7c3bbd11fc60f61d6f23e78a1933f182c7
Jakub Adamek [Fri, 7 Oct 2016 09:53:34 +0000 (10:53 +0100)]
Revert "Improving customization in DeviceDefault themes."
This reverts commit
426e7a0f8357b7401a4d3fc00ff89c5dd0de51c4.
Hugo Benichi [Fri, 7 Oct 2016 02:29:54 +0000 (02:29 +0000)]
Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
am:
ea2f7a4f05
Change-Id: I754c82f77800f09bbe700a3478cd1cac0e090a3d
Hugo Benichi [Fri, 7 Oct 2016 02:29:49 +0000 (02:29 +0000)]
Reject DHCP packets with no magic cookie
am:
006e061301
Change-Id: I54a32519d13e8d5463ca86630540722d73ff75cb
Hugo Benichi [Fri, 7 Oct 2016 02:22:32 +0000 (02:22 +0000)]
Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
Jim Miller [Fri, 7 Oct 2016 02:11:03 +0000 (19:11 -0700)]
Allow sysui navigation to work when application occludes keyguard
Fixes bug
30650150
Change-Id: Ie4a858dcfd259c733cd32c3c2b1dec2ff437f1ab
Hall Liu [Thu, 6 Oct 2016 21:48:08 +0000 (21:48 +0000)]
Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev
am:
0fe683da4d
Change-Id: I79b9ce817c6a95fc17795db59af83000dd1cd6dc
Hall Liu [Thu, 6 Oct 2016 21:48:03 +0000 (21:48 +0000)]
Add logging to CallerInfoAsyncQuery
am:
4c01910cb0
Change-Id: I20ab245d47085d546baf1ddfd940635b4aa4c7d5
Hall Liu [Thu, 6 Oct 2016 21:39:03 +0000 (21:39 +0000)]
Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev
Sid Soundararajan [Thu, 6 Oct 2016 21:14:17 +0000 (21:14 +0000)]
Merge "Recents TV: Do not allow negative delay" into nyc-mr1-dev
am:
3e0427e4f8
Change-Id: I88d9838788d75b36d0fa74a8d0561c5bc77066f0
Sid Soundararajan [Thu, 6 Oct 2016 21:14:14 +0000 (21:14 +0000)]
Recents TV: Do not allow negative delay
am:
a4a4763f58
Change-Id: I7146115b4f9e07c5574127909509d66db9cfab05
Chris Tate [Thu, 6 Oct 2016 21:13:02 +0000 (21:13 +0000)]
Merge "Fix job scheduler crash due to uninstall race" into nyc-mr1-dev
am:
24ab3aafe2
Change-Id: I7769bf73bd19e17818a7b36cad6f33a6a417e6b2
Christopher Tate [Thu, 6 Oct 2016 21:12:57 +0000 (21:12 +0000)]
Fix job scheduler crash due to uninstall race
am:
652c5ad516
Change-Id: Ied6a4348eb3a9293ff496f3bd56af4729126c5cf
Hugo Benichi [Thu, 6 Oct 2016 21:11:51 +0000 (21:11 +0000)]
Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev
am:
69544fd74d
Change-Id: Ib0bfee0896ed3b6e2fc776fc064b970bf6ab18ba
Hugo Benichi [Thu, 6 Oct 2016 21:11:47 +0000 (21:11 +0000)]
Catch runtime exceptions when parsing DHCP packets
am:
e0ea7fecd6
Change-Id: I1e701bb19b5c062f1527dd3e5b79e2e7860ca025
Amanda Kassay [Thu, 6 Oct 2016 21:11:01 +0000 (21:11 +0000)]
Wear Preview, auto, tv, versions project metadata. b/
31771704 b/
31903798 b/
31773716 am:
fd6846e116 am:
a7e9861112
am:
5aab061303
Change-Id: I655aefe5deb73e232d257b9d0c1c4e6bd14e8088
Bill Yi [Thu, 6 Oct 2016 21:09:49 +0000 (21:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5e6fb1699f -s ours
Change-Id: I2caf561510ebe5517040476e24921709f1765f60
Bill Yi [Thu, 6 Oct 2016 21:09:47 +0000 (21:09 +0000)]
Import translations. DO NOT MERGE
am:
41cf6c32a1 -s ours
Change-Id: If323a39228dbac08c42bf1ee70279cbc528e78d8
Bill Yi [Thu, 6 Oct 2016 21:08:37 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f381889844 -s ours
Change-Id: Id71bc5054fb8df28f0402757bf469e357e382b11
Bill Yi [Thu, 6 Oct 2016 21:08:35 +0000 (21:08 +0000)]
Import translations. DO NOT MERGE
am:
e6327db2af -s ours
Change-Id: I79712be6e299e0b0dd0eec86c25945a73acac62a
Nancy Zheng [Thu, 6 Oct 2016 21:07:48 +0000 (21:07 +0000)]
Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService.
am:
e39a8a46d9
Change-Id: Ic3aae2ed74eaf354d0a2439a9e8ff4b9e70d7e42
Tenghui Zhu [Thu, 6 Oct 2016 21:06:41 +0000 (21:06 +0000)]
Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev
am:
8e93abcd6c
Change-Id: Ifc3cc4bd8f4ae385a19919bab1a58f54d819af6e
Teng-Hui Zhu [Thu, 6 Oct 2016 21:06:36 +0000 (21:06 +0000)]
Make umbra lighter when the blocker is too high and has no real umbra area.
am:
9c555566bf
Change-Id: I785f5a25aae97f8852bb1cc4833f2662411eabc3
Winson Chung [Thu, 6 Oct 2016 21:05:19 +0000 (21:05 +0000)]
Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev
am:
e8ebe11209
Change-Id: I476da3de1a4c850d9c1e6947d53657c436e58d48
Winson Chung [Thu, 6 Oct 2016 21:05:17 +0000 (21:05 +0000)]
Revert "Bump up preloading recents on boot up to user unlocked."
am:
501d59dcea
Change-Id: I0f0c63f38bd1e43dbf0196ded6ceb2e829c94ec1
Adrian Roos [Thu, 6 Oct 2016 21:04:02 +0000 (21:04 +0000)]
Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev
am:
b9bb518632
Change-Id: Id8c2d014c1d66e7f1cd1a83e7074d46bc57e8644
Adrian Roos [Thu, 6 Oct 2016 21:03:54 +0000 (21:03 +0000)]
Ambient: Re-register all trigger sensors if one fires
am:
0288dcc825
Change-Id: Ia5e7c73eadb831e409aafd657427af98d242cdd2
Dirk Dougherty [Thu, 6 Oct 2016 21:03:02 +0000 (21:03 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am:
794e0d3578 am:
fc7475c5b3
am:
5d6be1abca
Change-Id: If6b795ed3864e721c1e06eee98839ca3505326a6
Dirk Dougherty [Thu, 6 Oct 2016 21:02:10 +0000 (21:02 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe
am:
7ceecc61ec
Change-Id: I0f7cf93959aed7eb8c425967f3b54e896d734606
Dirk Dougherty [Thu, 6 Oct 2016 21:01:10 +0000 (21:01 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92
am:
7f5f8b1df8
Change-Id: Id93f4f296eb20ca951a0e1bde6df445ec6c7c4fc
Dirk Dougherty [Thu, 6 Oct 2016 21:00:18 +0000 (21:00 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4
am:
ddd2e0442e
Change-Id: Ie92e3fc281de627fd81df6196e7886ff6c4bcc0d
Dianne Hackborn [Thu, 6 Oct 2016 20:58:58 +0000 (20:58 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
am:
534a17e96c
Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975
Dianne Hackborn [Thu, 6 Oct 2016 20:58:54 +0000 (20:58 +0000)]
Fix issue #
31305336: File corrupt: too many wake locks 101
am:
cb99a72e62
Change-Id: I01062999e2a1207c5d1bc826e8c9372c0fb012f7
Wei Liu [Thu, 6 Oct 2016 20:58:04 +0000 (20:58 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
am:
30a0f96250
Change-Id: I9b65c17d58907c861956bec0bc8f9f91ad8890af