OSDN Git Service
TreeHugger Robot [Wed, 4 Jan 2017 02:15:25 +0000 (02:15 +0000)]
Merge "Add checked exceptions to HwBinder transact."
Kevin Hufnagle [Wed, 4 Jan 2017 01:56:54 +0000 (01:56 +0000)]
Merge "docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345 am:
e102ea7b96" into nyc-mr2-dev-plus-aosp
am:
ab61a70601
Change-Id: I997157a59e209d0f08566b49813f3f743ab2fd98
Kevin Hufnagle [Wed, 4 Jan 2017 01:56:45 +0000 (01:56 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345 am:
e102ea7b96
am:
35f2186a3d
Change-Id: I94a9891c46330b5557983e35e573261a684636f1
Kevin Hufnagle [Wed, 4 Jan 2017 01:55:18 +0000 (01:55 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345 am:
c580c3401a
am:
a4a0906431
Change-Id: Ia91cab4a08489b22ebef4d152e4ab40cb300bc4a
Kevin Hufnagle [Wed, 4 Jan 2017 01:50:22 +0000 (01:50 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214 am:
c54a1a07da
am:
2a5e90da6b
Change-Id: I7896af5e833a17301854542841c552091cdd3f39
Android Build Merger (Role) [Wed, 4 Jan 2017 01:50:02 +0000 (01:50 +0000)]
Merge "docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345 am:
e102ea7b96" into nyc-mr2-dev-plus-aosp
Kevin Hufnagle [Wed, 4 Jan 2017 01:49:24 +0000 (01:49 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345
am:
e102ea7b96
Change-Id: I02c5fb6d5540cb91d7014e28a45c7b005bbceab7
Kevin Hufnagle [Wed, 4 Jan 2017 01:49:20 +0000 (01:49 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345
am:
c580c3401a
Change-Id: I66640153bd0dcaeca11f1e82fc0d721d995281ff
Kevin Hufnagle [Wed, 4 Jan 2017 01:47:43 +0000 (01:47 +0000)]
Merge "Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214 am:
75896821cb" into nyc-mr2-dev-plus-aosp
am:
c22fe7906a
Change-Id: If147093d00d9dfdbcbe3c451e21006cc78f64153
Kevin Hufnagle [Wed, 4 Jan 2017 01:47:35 +0000 (01:47 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214 am:
75896821cb
am:
8cebd14d27
Change-Id: Ic713435cf6001770960af48a51efc5d975edff9c
Kevin Hufnagle [Wed, 4 Jan 2017 01:46:07 +0000 (01:46 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d am:
8f8f62a499" into nyc-mr2-dev-plus-aosp
am:
dda687ea9a
Change-Id: Iec8e58cceade7a5729336724ccd61957acbccffd
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:58 +0000 (01:45 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d am:
8f8f62a499
am:
503431d034
Change-Id: I70a671eb38347d0e60e4cac1740ecbfdab8b9d33
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:26 +0000 (01:45 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d
am:
63d1963345
Change-Id: I586a41814eb4f0d15d411e03b80c02dfa782b5eb
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:22 +0000 (01:45 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d
am:
63d1963345
Change-Id: Ie101eda01c3b772c0944c56cfede1514acadf1e1
Kevin Hufnagle [Wed, 4 Jan 2017 01:44:44 +0000 (01:44 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d am:
c2aae1a1e7
am:
2427b36665
Change-Id: Ia186ece4f69d2e94b88cb73296674383fe6a00c8
Kevin Hufnagle [Wed, 4 Jan 2017 01:43:01 +0000 (01:43 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214
am:
c54a1a07da
Change-Id: I93e0e5d79a8e59ca09d1a642cfe0f690e044a6b9
Kevin Hufnagle [Wed, 4 Jan 2017 01:41:25 +0000 (01:41 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0
am:
fb99d1450d
Change-Id: Ibe527fb777ca3975fed67a951f2ddb8f2b81a833
Android Build Merger (Role) [Wed, 4 Jan 2017 01:39:24 +0000 (01:39 +0000)]
Merge "Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214 am:
75896821cb" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 4 Jan 2017 01:38:52 +0000 (01:38 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d am:
8f8f62a499" into nyc-mr2-dev-plus-aosp
Kevin Hufnagle [Wed, 4 Jan 2017 01:38:51 +0000 (01:38 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214
am:
75896821cb
Change-Id: I167f5334490ec6ebdedd7a27a3dfd091f20a760a
Kevin Hufnagle [Wed, 4 Jan 2017 01:38:19 +0000 (01:38 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d
am:
8f8f62a499
Change-Id: I2fcfba34f1585b5f0bb44e7ebd445f3fca088b29
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:51 +0000 (01:37 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d
am:
c2aae1a1e7
Change-Id: I6c8f8c224b33c46da62c66765608b02125af8598
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:00 +0000 (01:37 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7
am:
d7c1e9bcd0
Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3
Kevin Hufnagle [Wed, 4 Jan 2017 01:36:01 +0000 (01:36 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555
am:
d99f3b7214
Change-Id: I62cf43c6bb6e7ddbd9464243362f1c62fc79589f
Kevin Hufnagle [Wed, 4 Jan 2017 01:33:39 +0000 (01:33 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555
am:
d99f3b7214
Change-Id: I9a86dda9da8d525a23af69817044453fdf083ee4
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:55 +0000 (01:32 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2
am:
01e3564a0d
Change-Id: Iaed661507e97025f1b0c12aa9e808c006c184cac
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:53 +0000 (01:32 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2
am:
01e3564a0d
Change-Id: Ic1454c9328a54777ba21cdee438e8d1bf91d5130
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:24 +0000 (01:32 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50
am:
c32df53fc7
Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9
Kevin Hufnagle [Wed, 4 Jan 2017 01:29:30 +0000 (01:29 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc
am:
b7c9651555
Change-Id: I8c06b2b162ca5837ba9157ef91bb5a8d1489e36a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:19 +0000 (01:28 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38
am:
4418907d50
Change-Id: I486f53410a427f373daec719bac522289d812e7a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:17 +0000 (01:28 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85
am:
1c85b504e2
Change-Id: Iabd407dce1b3f01da5bbbd576536d0b77415d300
Kevin Hufnagle [Wed, 4 Jan 2017 01:25:12 +0000 (01:25 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5
am:
2ff9c02bdc
Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:24 +0000 (01:24 +0000)]
docs: Added descriptions of IAB subscription-specific settings.
am:
145b377b38
Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:23 +0000 (01:24 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef
am:
c8ccc66e85
Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
am:
dbe9b81ef5
Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:47 +0000 (01:18 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs
am:
98a11580ef
Change-Id: I2c44d24b772d3df80dabab418875a1e9842aebbf
Kevin Hufnagle [Wed, 4 Jan 2017 01:14:21 +0000 (01:14 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Steven Moreland [Tue, 20 Dec 2016 23:55:48 +0000 (15:55 -0800)]
Add checked exceptions to HwBinder transact.
Bug:
33673120
Test: hidl_test_java
Change-Id: I7b62eb6b066fc24c44ef7e46aaa2a3208c053d11
Adrian Roos [Wed, 4 Jan 2017 00:11:12 +0000 (00:11 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev am:
f39f98f562
am:
05114bc9a1
Change-Id: Icafd99613e3267e4db1e83ca5bf053a119822651
dooyoung.hwang [Wed, 4 Jan 2017 00:10:18 +0000 (00:10 +0000)]
QS - Fix race condition in accessibility am:
acf90acf13
am:
0e8ba6fd74
Change-Id: I8dc6a15ed67fd3cabceb52c7fd9cb0d06e5a5732
Adrian Roos [Wed, 4 Jan 2017 00:06:23 +0000 (00:06 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
am:
f39f98f562
Change-Id: Idf706cf94602615e746fe51c8ac17acde4258829
dooyoung.hwang [Wed, 4 Jan 2017 00:06:17 +0000 (00:06 +0000)]
QS - Fix race condition in accessibility
am:
acf90acf13
Change-Id: I8ecbc3f40c58dd56f94c00a452a6d84461ee698e
Adrian Roos [Wed, 4 Jan 2017 00:01:04 +0000 (00:01 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
Hakan Seyalioglu [Tue, 3 Jan 2017 23:33:44 +0000 (23:33 +0000)]
Merge "Do the sorting for the ShareSheet asynchronously."
Jean-Michel Trivi [Tue, 3 Jan 2017 23:02:45 +0000 (23:02 +0000)]
Merge "MediaPlayer: do not crash when there is no context"
TreeHugger Robot [Tue, 3 Jan 2017 22:39:02 +0000 (22:39 +0000)]
Merge "Create ScoredNetwork Badging API changes."
Lei Yu [Tue, 3 Jan 2017 22:15:07 +0000 (22:15 +0000)]
Merge "Add TileColorPicker to remove hardcoded tile state color"
TreeHugger Robot [Tue, 3 Jan 2017 22:08:51 +0000 (22:08 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
TreeHugger Robot [Tue, 3 Jan 2017 21:58:48 +0000 (21:58 +0000)]
Merge "Fixing some interaction issues with the PIP menu."
Makoto Onuki [Tue, 3 Jan 2017 21:34:36 +0000 (21:34 +0000)]
Merge "Get account features before taking lock"
Hakan Seyalioglu [Thu, 8 Dec 2016 00:38:57 +0000 (16:38 -0800)]
Do the sorting for the ShareSheet asynchronously.
This lets the screen fade out and share sheet start being displayed
before all results are sorted. Based heavily on ag/
1126533. There are
two other follow ups that I'd like to do after this that aren't a part
of this change:
1) Investigating images being loaded multiple times (from original
change)
2) Put placeholder space while the sorted images are coming in - at the
moment there's some jank when the list of applications becomes
visible.
Test: Unit tests for ChooserActivityTest (still would like to add tests
for ResolveInfoController and UsbResolverActivity).
Change-Id: I4c4a65fff1b0f17fc52b9bd01c3d5c59d649d119
Jean-Michel Trivi [Tue, 3 Jan 2017 20:53:36 +0000 (12:53 -0800)]
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
Marie Janssen [Tue, 3 Jan 2017 20:36:08 +0000 (20:36 +0000)]
Bluetooth: track enabling in dumpsys am:
a50cc71471
am:
feb4c8cc23
Change-Id: I95fa35eda0a250b8c1f4a7a04eb74976ccf82191
Marie Janssen [Tue, 3 Jan 2017 20:28:01 +0000 (20:28 +0000)]
Bluetooth: track enabling in dumpsys
am:
a50cc71471
Change-Id: Ifacdcb4c28d6a3a5b745434e1f6ae83c3688f7a9
TreeHugger Robot [Tue, 3 Jan 2017 20:03:39 +0000 (20:03 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
Jeff Sharkey [Tue, 3 Jan 2017 19:56:07 +0000 (19:56 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be am:
4b80a4a372 am:
1e1cdbead1
am:
7664e61885
Change-Id: I91c0810aad2ec530650855bcd2f1d25c309717a1
Jeff Sharkey [Tue, 3 Jan 2017 19:48:36 +0000 (19:48 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be am:
4b80a4a372
am:
1e1cdbead1
Change-Id: Ic00acfb0efb6188a15357322528075d41467310b
Robert Greenwalt [Tue, 3 Jan 2017 19:48:04 +0000 (19:48 +0000)]
resolve merge conflicts of
e6b6653da899 to nyc-mr2-dev-plus-aosp
am:
5f0dad0e64
Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0
Robert Greenwalt [Tue, 3 Jan 2017 19:35:37 +0000 (11:35 -0800)]
resolve merge conflicts of
e6b6653da899 to nyc-mr2-dev-plus-aosp
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
Jeff Sharkey [Tue, 3 Jan 2017 19:31:36 +0000 (19:31 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be
am:
4b80a4a372
Change-Id: I2ab9a2bd2ff60cafea332998789ad947dda0140b
Winson Chung [Sat, 17 Dec 2016 00:20:16 +0000 (16:20 -0800)]
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>
Jeff Sharkey [Tue, 3 Jan 2017 19:24:00 +0000 (19:24 +0000)]
Merge "Offer to measure disk stats using quotas."
am:
f8720b95be
Change-Id: I56bab3ec4895c232ce8287623827c20f2dbfaaf6
jackqdyulei [Mon, 5 Dec 2016 23:03:56 +0000 (15:03 -0800)]
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
Lei Yu [Tue, 3 Jan 2017 19:10:04 +0000 (19:10 +0000)]
Merge "Set background of DrawerLayout to statusBarColor"
Jeff Sharkey [Tue, 3 Jan 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Offer to measure disk stats using quotas."
Makoto Onuki [Thu, 15 Dec 2016 22:26:55 +0000 (14:26 -0800)]
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
Robin Lee [Tue, 3 Jan 2017 18:43:48 +0000 (18:43 +0000)]
Merge "Don't check for monitoring CA certs in cryptkeeper"
TreeHugger Robot [Tue, 3 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "Fix out of bounds memory read in GIFMovie.cpp"
Marie Janssen [Wed, 28 Dec 2016 22:13:21 +0000 (14:13 -0800)]
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
5980456040217f330289e3fa59df4efaafb1c6c5)
Robert Greenwalt [Tue, 3 Jan 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am:
43ced5941e
am:
14a5b810b6
Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
Robert Greenwalt [Tue, 3 Jan 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
am:
43ced5941e
Change-Id: I5457b80932f4bb155bf136fc4e05199f04ca7e7c
Robert Greenwalt [Tue, 3 Jan 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
Jeff Sharkey [Tue, 13 Dec 2016 15:44:51 +0000 (08:44 -0700)]
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
dongwan0605.kim [Tue, 3 Jan 2017 16:34:00 +0000 (16:34 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am:
fce04dc0be am:
56812a0146 am:
852fb2b1f1
am:
29d656dbe1
Change-Id: Ibfa95306964670aa10618bc5aa377a0a1bb6ab06
dongwan0605.kim [Tue, 3 Jan 2017 16:27:27 +0000 (16:27 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am:
fce04dc0be am:
56812a0146
am:
852fb2b1f1
Change-Id: Ide5e7c588eb1707015ac33a13fb9788e80617587
dongwan0605.kim [Tue, 3 Jan 2017 16:17:28 +0000 (16:17 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am:
fce04dc0be
am:
56812a0146
Change-Id: If8d2963ed44e49e3b33b73a82378b2af32ba4676
dongwan0605.kim [Tue, 3 Jan 2017 16:09:21 +0000 (16:09 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"
am:
fce04dc0be
Change-Id: I83100ac5c1f4d896d96d2ff12d0ad59eba8b533b
Leon Scroggins III [Tue, 3 Jan 2017 16:02:03 +0000 (11:02 -0500)]
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
Treehugger Robot [Tue, 3 Jan 2017 15:54:21 +0000 (15:54 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"
Ivan Podogov [Tue, 3 Jan 2017 14:16:59 +0000 (14:16 +0000)]
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
Change-Id: I63dda24101762a8407f1fafa5b21d4adb99c71d9
Ivan Podogov [Tue, 3 Jan 2017 14:16:48 +0000 (14:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83 am:
2dd60e81ad
am:
171af67a69
Change-Id: I0c9c6a6f8fd3c0f5246426741c244699438def24
Ivan Podogov [Tue, 3 Jan 2017 14:15:01 +0000 (14:15 +0000)]
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
Change-Id: I741841d40df5a46e479160ab4e75b958eea9cc1e
Ivan Podogov [Tue, 3 Jan 2017 14:14:52 +0000 (14:14 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83 am:
57f7c2db57
am:
2518fb03dc
Change-Id: If70af15581f2182a4175e9b48a7b2b93d3cbd2f5
Ivan Podogov [Tue, 3 Jan 2017 14:13:03 +0000 (14:13 +0000)]
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
Change-Id: I7ba648d4df507ccdc69cbf9e2387f9825d650621
Ivan Podogov [Tue, 3 Jan 2017 14:12:53 +0000 (14:12 +0000)]
In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32 am:
0368be4523
am:
bf3e524976
Change-Id: Idfb0800fbbbdb5a274f2e22eeb560c710b4549c8
Ivan Podogov [Tue, 3 Jan 2017 12:02:18 +0000 (12:02 +0000)]
resolve merge conflicts of
43dc6e7 to master
Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5
Niels Egberts [Tue, 3 Jan 2017 11:52:38 +0000 (11:52 +0000)]
Merge "Remove refernces to V1 API, as V2 doesn't exist anymore."
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:33 +0000 (11:18 +0000)]
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
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:25 +0000 (11:18 +0000)]
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
Ivan Podogov [Tue, 3 Jan 2017 11:17:45 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83
am:
2dd60e81ad
Change-Id: Ie0b2f16368d5d6d1d12a140bf57049ae29c7b84f
Ivan Podogov [Tue, 3 Jan 2017 11:17:39 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am:
34624a5d83
am:
57f7c2db57
Change-Id: If36ef6f3fd072fa5ac0593584b499e050d30d4dc
Android Build Merger (Role) [Tue, 3 Jan 2017 11:17:22 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32 am:
0368be4523" into nyc-mr2-dev-plus-aosp
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32
am:
0368be4523
Change-Id: I677252c7b488637ca1b24595b9d5dba09d77b06b
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am:
d2d32b1f32
am:
41f3188f73
Change-Id: Iab790f80b2ca9c810bb6f1d15783ab48d0f04569
Ivan Podogov [Tue, 3 Jan 2017 11:08:39 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am:
34624a5d83
Change-Id: I43d92809b076e64ac0677303977c2950b556734b
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am:
34624a5d83
Change-Id: If251197924b6f2f7b1970c614b5ceccc70edef4a
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am:
d2d32b1f32
Change-Id: I85808eba60ad76b7492803c2cca643161521067a
Ivan Podogov [Tue, 3 Jan 2017 11:08:29 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am:
d2d32b1f32
Change-Id: I89a4c24cf0bd4154ca87f04e41b2cc64c49b39b2
Ivan Podogov [Tue, 3 Jan 2017 11:00:49 +0000 (11:00 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
dongwan0605.kim [Tue, 3 Jan 2017 06:40:07 +0000 (15:40 +0900)]
QS: Fix QuickQS visibility at non-first page
When user collapsed QSPanel at non-first page, QuickQS always remained
View.Visible. When user canceled collapsing, QQS remained clickable
although invisible to user(alpha = 0).
QQS must be non-clickable when user cancels collapsing at non-first page.
Test: QSPanel > 2nd page > Cancel collapsing while collapse QSPanel
> Verify invisible QQS is non-clickable
Change-Id: I4c1f195a3faec8e89bb073443f6345f4faddf781
OSDN Git Service
