Adam Lesinski
51d94c82af
Merge "BatteryStats: Remove reading of cpu power" into oc-dev
...
am: af85d84050
Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
Jim Van Verth
c7fd8db8a6
Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev
...
am: 1be9766a68
Change-Id: I8034dff9695425939a00b3f38d06615ffcc0f2b4
2017-04-13 20:16:17 +00:00
TreeHugger Robot
80b7a214ba
Merge "Update docs for obtainStyledAttribute" into oc-dev
2017-04-13 20:15:51 +00:00
Dianne Hackborn
76c71a01e2
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
...
am: 29c70437b3
Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
2017-04-13 20:15:05 +00:00
Jason Monk
cea904333e
Merge "Fix leak in nav bar" into oc-dev
...
am: 0b67d53ba9
Change-Id: I46aa7def6eb54f967ab568fc459786d0401055d3
2017-04-13 20:13:55 +00:00
Shuo Qian
21d8d8095e
Merge "ECBM SystemProperty cleanup" into oc-dev
...
am: efb8882b47
Change-Id: I69e063bbb4c93f94d50c58a1c8af1643f5e024ca
2017-04-13 20:11:41 +00:00
Bryce Lee
61bce9ab13
Merge "Remove window container from empty task when destroying." into oc-dev
2017-04-13 20:10:56 +00:00
Daniel Nishi
3cf3b199e3
Revert "Use the StorageStatsManager in FileCollector."
...
This reverts commit bd441caaf6fb268b2756bc51304efa038bf58376 due to
causing NPE crashes.
Bug: 37314851
Change-Id: I933eaa3888f84945873de8f7fca0d235306f6aaa
2017-04-13 20:10:39 +00:00
Geoffrey Pitsch
aa8dcf3751
Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
...
am: c4ca1b5677
Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
2017-04-13 20:10:13 +00:00
Adam Lesinski
af85d84050
Merge "BatteryStats: Remove reading of cpu power" into oc-dev
2017-04-13 20:09:51 +00:00
Jack He
97164fe986
Merge "Add developer setting and system API for inband ringing support" into oc-dev
...
am: aadf525e1a
Change-Id: I458b5df924ca65edc4b38ee1e275b6b6f86310fe
2017-04-13 20:07:44 +00:00
Jim Van Verth
1be9766a68
Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev
2017-04-13 20:01:47 +00:00
TreeHugger Robot
29c70437b3
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
2017-04-13 20:01:32 +00:00
Romain Guy
bfa58aab0a
Range check transfer params in float domain
...
Our native code uses floats for transfer parameters, the range
check was too small (using the next representable double instead
of the next representable float).
Bug: 37013532
Test: Manual run of broken app, CtsGraphicsTestCases
Change-Id: Id91a3e62068be0abf13ee75e39c758eb106a5f24
2017-04-13 12:59:38 -07:00
Todd Kennedy
0bb486bcb4
Merge "Filter instant app content providers" into oc-dev
...
am: 3891674204
Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318
2017-04-13 19:59:28 +00:00
Adam Lesinski
ea134e08d7
AAPT2: Fix order-of-destruction crash
...
Make sure that users of StringPool are destroyed before
the StringPool itself.
Test: valgrind aapt2 optimize -o opt.apk out/target/common/obj/APPS/framework-res_intermediates/package-export.apk
Change-Id: I140c2d32f8449028976795d5d6865d83e1409b53
2017-04-13 12:57:06 -07:00
TreeHugger Robot
0b67d53ba9
Merge "Fix leak in nav bar" into oc-dev
2017-04-13 19:55:52 +00:00
TreeHugger Robot
5690917679
Merge "Add SkiaCanvas::captureCanvasState()"
2017-04-13 19:54:11 +00:00
TreeHugger Robot
efb8882b47
Merge "ECBM SystemProperty cleanup" into oc-dev
2017-04-13 19:53:14 +00:00
TreeHugger Robot
c4ca1b5677
Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
2017-04-13 19:50:00 +00:00
Jason Monk
4520cb7ad9
Merge "Update mobile data icon" into oc-dev
...
am: 99856429db
Change-Id: I1cb5f4e16f3832ff304894fac43eced6decd020d
2017-04-13 19:46:47 +00:00
Chris Tate
636915a2ed
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
...
am: 117ac766a9
Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
2017-04-13 19:45:30 +00:00
Jack He
aadf525e1a
Merge "Add developer setting and system API for inband ringing support" into oc-dev
2017-04-13 19:43:54 +00:00
TreeHugger Robot
3891674204
Merge "Filter instant app content providers" into oc-dev
2017-04-13 19:43:31 +00:00
Seigo Nonaka
17452ee553
Merge "Introduce setFallbackTypeface" into oc-dev
...
am: 729a515e5e
Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
2017-04-13 19:38:09 +00:00
TreeHugger Robot
99856429db
Merge "Update mobile data icon" into oc-dev
2017-04-13 19:37:36 +00:00
Yu Liu
5303f33bdc
Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
...
am: e425b366ba
Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
2017-04-13 19:34:48 +00:00
Chris Tate
117ac766a9
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
2017-04-13 19:24:13 +00:00
TreeHugger Robot
729a515e5e
Merge "Introduce setFallbackTypeface" into oc-dev
2017-04-13 19:21:25 +00:00
Yu Liu
e425b366ba
Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
2017-04-13 19:21:03 +00:00
Daniel Sandler
dc4fd3c847
Merge "Quick fix to lockscreen text color." into oc-dev
...
am: f06c2a01a5
Change-Id: If3ec3b915bb2defe9999b323bf7f7ce2c55ff7be
2017-04-13 19:16:13 +00:00
Daniel Sandler
f06c2a01a5
Merge "Quick fix to lockscreen text color." into oc-dev
2017-04-13 19:06:28 +00:00
Jean-Michel Trivi
a53b7051a2
Fix A11y volume persisting/restore
...
When the accessibility volume is enabled, its value wasn't persisted
when changed because it was still using the persisting name from
its alias (music).
When enabled, notiify the volume controller that a11y volume has
changed so the UI also reflects the new value, now updated from
the persisted settings.
Do not persist volumes for streams that don't have a setting name.
Test: enable Talkback, set a11y volume at a different level than media \
then disable Talkback. Reboot and enable Talkback, verify a11y is \
restored.
Bug: 36286073
Change-Id: Ic6c30364e164b856fc10fbf6b22c09a7b5561be1
2017-04-13 12:04:15 -07:00
Bookatz
2bffb5bb3a
Collect background stats: syncs
...
Added background times and counts for an app's sync usage.
Bug: 35669746
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I1c01c5044064277b97e8d330386454da3e8204da
2017-04-13 11:59:33 -07:00
Dan Sandler
0c9b9ae557
Quick fix to lockscreen text color.
...
Bug: 37299706
Test: visual
Change-Id: Ide48186f0f1cb4a50c77b45ae8b80a79781d7b0d
2017-04-13 14:50:30 -04:00
Daniel Nishi
57fb5872d1
Merge changes from topic 'cp-movies' into oc-dev
...
am: ff97ea2eef
Change-Id: Ife4f6fb260439003a46e6510af41f8bb6c542cb7
2017-04-13 18:44:53 +00:00
Daniel Nishi
ff97ea2eef
Merge changes from topic 'cp-movies' into oc-dev
...
* changes:
Use the real filters when determining Other Apps.
Add support for movies & tv apps querying.
2017-04-13 18:39:57 +00:00
Adam Lesinski
41a2fb1c75
Add example to TypedValue.changingConfigurations JavaDoc
...
Also includes a list of possible bits that can be set.
Bug: 36676115
Change-Id: I84fd374a00debb4647719e62cf5a1ef22bb6071c
Test: builds
2017-04-13 11:39:50 -07:00
Andrii Kulian
22512e8a22
Hide flag SHOW_WITH_INSECURE_KEYGUARD
...
Bug: 36555156
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I831ada0ffd35ab96af8ae821588c9f6e0ff30e5a
2017-04-13 11:35:40 -07:00
jiabin
0b8df1dedb
Add TvProvider methods to block or unblock package, get blocked packages
...
Test: gts-tradefed run gts -m GtsTvTestCases
Bug: 36697660
Change-Id: I6464542820a4b56e3145eecdf28ebd422a567040
2017-04-13 11:35:28 -07:00
Roozbeh Pournader
18fcf3f0d7
Merge "Switch i18n listeners to use IME hint locales" into oc-dev
...
am: da97b66f41
Change-Id: I9db037d0566c35c12aaed5e3f509498ca498b34f
2017-04-13 18:33:57 +00:00
Chris Wren
a881fc2e2c
Merge "don't interpret milliseconds as nanoseconds" into oc-dev
...
am: de12503268
Change-Id: I51eb680e3e966577e30647b6529e900894da60c4
2017-04-13 18:31:49 +00:00
Steve McKay
0b28e794de
Merge "Remove support for auto-paging of cursors." into oc-dev
...
am: 7f0d8c8076
Change-Id: Ice100c419ce6d53721d6bbec1147bb1cc1bb7b4d
2017-04-13 18:26:43 +00:00
Matt Sarett
d0814db633
Add SkiaCanvas::captureCanvasState()
...
Test: Verified bug is fixed. Wrote unit test.
Bug: 37268771
Change-Id: I9deb7db353cd2129ad245e7f65419670463bb717
2017-04-13 14:23:38 -04:00
TreeHugger Robot
da97b66f41
Merge "Switch i18n listeners to use IME hint locales" into oc-dev
2017-04-13 18:23:05 +00:00
Daichi Hirono
8bf30a7826
Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
...
am: 73b54bfd6d
Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469
2017-04-13 18:21:18 +00:00
TreeHugger Robot
de12503268
Merge "don't interpret milliseconds as nanoseconds" into oc-dev
2017-04-13 18:18:26 +00:00
TreeHugger Robot
7f0d8c8076
Merge "Remove support for auto-paging of cursors." into oc-dev
2017-04-13 18:12:14 +00:00
TreeHugger Robot
73b54bfd6d
Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
2017-04-13 18:11:48 +00:00
Jason Monk
359bb74a54
Fix location status bar icon
...
It should have been in PhoneStatusBarPolicy, since it wasn't it
wouldn't listen until something else touched the LocationController
like QS.
Test: Open app that uses location
Change-Id: I70d1aff2a1c9bf7be53aeb72ba285b49d98c5362
Fixes: 36747248
2017-04-13 14:09:32 -04:00