Fan Zhang
cf439c0e80
Disable nav drawer in Settings app.
...
Bug: 34054123
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/drawer/SettingsDrawerActivityTest.java
Change-Id: Ia6ae42315c3d1798803b9554aa8400aafa2f31fa
2017-01-03 16:41:50 -08:00
Jean-Michel Trivi
1202685743
Merge "MediaPlayer: do not crash when there is no context"
2017-01-03 23:02:48 +00:00
TreeHugger Robot
7429c4fede
Merge "Create ScoredNetwork Badging API changes."
2017-01-03 22:39:06 +00:00
Lei Yu
c71f5b34ce
Merge "Add TileColorPicker to remove hardcoded tile state color"
2017-01-03 22:15:11 +00:00
TreeHugger Robot
3c9ce1cd17
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
2017-01-03 22:08:55 +00:00
TreeHugger Robot
da8b27ce09
Merge "Fixing some interaction issues with the PIP menu."
2017-01-03 21:58:52 +00:00
Makoto Onuki
9bab1c4dd5
Merge "Get account features before taking lock"
2017-01-03 21:34:41 +00:00
Jean-Michel Trivi
791c48458e
MediaPlayer: do not crash when there is no context
...
Prevent NPE when the instance is running without a context.
This enables writing command-line test apps.
Test: vendor/google_toolbox/team/audio/cmds/ClMediaPlayer
Change-Id: Ie74112334675c5d9d3efdb28c7178c49d8729acb
2017-01-03 12:53:36 -08:00
Marie Janssen
2a88008276
Bluetooth: track enabling in dumpsys am: a50cc71471
...
am: feb4c8cc23
2017-01-03 20:36:08 +00:00
Marie Janssen
feb4c8cc23
Bluetooth: track enabling in dumpsys
...
am: a50cc71471
2017-01-03 20:28:01 +00:00
TreeHugger Robot
196bbe7a4b
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
2017-01-03 20:03:44 +00:00
Jeff Sharkey
dbc2ef417b
Merge "Offer to measure disk stats using quotas." am: f8720b95be am: 4b80a4a372 am: 1e1cdbead1
...
am: 7664e61885
2017-01-03 19:56:07 +00:00
Jeff Sharkey
7664e61885
Merge "Offer to measure disk stats using quotas." am: f8720b95be am: 4b80a4a372
...
am: 1e1cdbead1
2017-01-03 19:48:36 +00:00
Robert Greenwalt
7751269d37
resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp
...
am: 5f0dad0e64
2017-01-03 19:48:04 +00:00
Robert Greenwalt
5f0dad0e64
resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp
...
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
2017-01-03 11:35:37 -08:00
Jeff Sharkey
1e1cdbead1
Merge "Offer to measure disk stats using quotas." am: f8720b95be
...
am: 4b80a4a372
2017-01-03 19:31:36 +00:00
Winson Chung
c75ffe8ccb
Fixing some interaction issues with the PIP menu.
...
- Due to jank when finishing the PIP menu activity, we handle the
menu visibility explicitly and keep the menu activity around
once triggered (until PIP ends), instead of finishing and
recreating it each time it is invoked. This also gives us the
flexibility to control how the animation looks of both the menu
and individual actions.
- Allow dragging the PIP while the menu activity is showing and
taking input
- Tapping outside of the PIP now hides the menu
Test: Enable the tap-to-interact in the SysUI tuner and drag while
the menu is showing.
Change-Id: Iac74710100d793e6825b00c7c0d71b85fb420fa0
Signed-off-by: Winson Chung <winsonc@google.com >
2017-01-03 11:28:37 -08:00
Jeff Sharkey
4b80a4a372
Merge "Offer to measure disk stats using quotas."
...
am: f8720b95be
2017-01-03 19:24:00 +00:00
jackqdyulei
76471a5d9e
Add TileColorPicker to remove hardcoded tile state color
...
1. Remove hardcoded color qs_tile_tint_* in colors.xml
2. Add tint_color_selector.xml which uses colorForeground and alpha
to tint.
3. Use TileColorPicker to grab tile state colors from
tint_color_selector.xml and provide them to customTile and BatteryTile
Bug: 32592245
Test: make -j40 SystemUITests
Change-Id: Ie5fc828c3c6d4e1f192643592c034f462fae5313
2017-01-03 11:21:59 -08:00
Lei Yu
50e0a9a396
Merge "Set background of DrawerLayout to statusBarColor"
2017-01-03 19:10:08 +00:00
Jeff Sharkey
f8720b95be
Merge "Offer to measure disk stats using quotas."
2017-01-03 19:08:08 +00:00
Makoto Onuki
606da7778f
Get account features before taking lock
...
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug: 33481725
Change-Id: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
2017-01-03 10:58:23 -08:00
Robin Lee
f8ced7790a
Merge "Don't check for monitoring CA certs in cryptkeeper"
2017-01-03 18:43:52 +00:00
TreeHugger Robot
dc143e01cc
Merge "Fix out of bounds memory read in GIFMovie.cpp"
2017-01-03 18:18:02 +00:00
Marie Janssen
a50cc71471
Bluetooth: track enabling in dumpsys
...
Move basic state dumpsys to here from AdapterService.
Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.
Test: start phone and enable/disable, take bug report
Bug: 33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
(cherry picked from commit 5980456040
2017-01-03 10:13:55 -08:00
Robert Greenwalt
e6b6653da8
Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
...
am: 14a5b810b6
2017-01-03 17:40:27 +00:00
Robert Greenwalt
14a5b810b6
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
...
am: 43ced5941e
2017-01-03 17:32:59 +00:00
Robert Greenwalt
43ced5941e
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
2017-01-03 17:26:59 +00:00
Jeff Sharkey
5eb3eb58ac
Offer to measure disk stats using quotas.
...
Now we're getting somewhere! This CL starts measuring disk usage
using quotactl(), which is almost instant and has much lower impact
on flash memory lifetime.
We now grant the per-app cache GID to every launched app, and the
ContextImpl logic that creates cache directories matches the logic
down in installd.
Test: builds, boots, quota stats match manual stats
Bug: 27948817
Change-Id: Ie269a2958ce0e1c17cb74dbfecc791a5c12922cf
2017-01-03 10:22:39 -07:00
dongwan0605.kim
16ea7f7640
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146 am: 852fb2b1f1
...
am: 29d656dbe1
2017-01-03 16:34:00 +00:00
dongwan0605.kim
29d656dbe1
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146
...
am: 852fb2b1f1
2017-01-03 16:27:27 +00:00
dongwan0605.kim
852fb2b1f1
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be
...
am: 56812a0146
2017-01-03 16:17:28 +00:00
dongwan0605.kim
56812a0146
Merge "QS: Fix QuickQS visibility at non-first page"
...
am: fce04dc0be
2017-01-03 16:09:21 +00:00
Leon Scroggins III
e2327c0fda
Fix out of bounds memory read in GIFMovie.cpp
...
Test: TODO (to be separately uploaded to CTS)
When decoding a GIF image, do not attempt to copy an index if it is out
of range.
BUG:33897722
Change-Id: I8c8ca69b00bf1f655e62bbe1798b9a47bf6699be
2017-01-03 11:02:03 -05:00
Treehugger Robot
fce04dc0be
Merge "QS: Fix QuickQS visibility at non-first page"
2017-01-03 15:54:21 +00:00
Ivan Podogov
9cb68a081c
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp
...
am: 873c2054c9
2017-01-03 14:16:59 +00:00
Ivan Podogov
21a7dbb9e8
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad
...
am: 171af67a69
2017-01-03 14:16:48 +00:00
Ivan Podogov
0407c4a64a
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57" into nyc-mr2-dev-plus-aosp
...
am: e337729543
2017-01-03 14:15:01 +00:00
Ivan Podogov
7273449a8b
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57
...
am: 2518fb03dc
2017-01-03 14:14:52 +00:00
Ivan Podogov
f297340b61
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
...
am: 03b1d52088
2017-01-03 14:13:03 +00:00
Ivan Podogov
a01a471d4f
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523
...
am: bf3e524976
2017-01-03 14:12:53 +00:00
Ivan Podogov
1ab8725378
resolve merge conflicts of 43dc6e7 to master
...
Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5
2017-01-03 12:38:31 +00:00
Niels Egberts
9b01193770
Merge "Remove refernces to V1 API, as V2 doesn't exist anymore."
2017-01-03 11:52:42 +00:00
Android Build Merger (Role)
873c2054c9
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp
2017-01-03 11:18:36 +00:00
Android Build Merger (Role)
e337729543
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57" into nyc-mr2-dev-plus-aosp
2017-01-03 11:18:29 +00:00
Ivan Podogov
171af67a69
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83
...
am: 2dd60e81ad
2017-01-03 11:17:45 +00:00
Ivan Podogov
2518fb03dc
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83
...
am: 57f7c2db57
2017-01-03 11:17:39 +00:00
Android Build Merger (Role)
03b1d52088
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
2017-01-03 11:17:25 +00:00
Ivan Podogov
bf3e524976
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
...
am: 0368be4523
2017-01-03 11:16:31 +00:00
Ivan Podogov
43dc6e795c
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
...
am: 41f3188f73
2017-01-03 11:16:31 +00:00
