OSDN Git Service
Hugo Benichi [Tue, 13 Dec 2016 02:23:02 +0000 (02:23 +0000)]
Merge "Unit tests for NetworkNotificationManager"
Ben Lin [Tue, 13 Dec 2016 01:58:48 +0000 (01:58 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev am:
50e8e64c45 -s ours
am:
279845e54c -s ours
Change-Id: If7728696791b206a62185b157206cd5376092198
Ben Lin [Tue, 13 Dec 2016 01:57:41 +0000 (01:57 +0000)]
DO NOT MERGE ANYWHERE am:
4c80659e99 -s ours
am:
6f67f964c3 -s ours
Change-Id: I219054dfb871e09c8b788344737c2d2aa5adc99d
Ben Lin [Tue, 13 Dec 2016 01:46:11 +0000 (01:46 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
am:
50e8e64c45 -s ours
Change-Id: I1ef606566d2c1dfbe6ff273e073a45b72a0d788f
Ben Lin [Tue, 13 Dec 2016 01:46:07 +0000 (01:46 +0000)]
DO NOT MERGE ANYWHERE
am:
4c80659e99 -s ours
Change-Id: I1d5b79452fcca235e8026cab583040db69aff1e6
TreeHugger Robot [Tue, 13 Dec 2016 01:44:38 +0000 (01:44 +0000)]
Merge "Only checking activity state to determine visibility when entering PiP."
TreeHugger Robot [Tue, 13 Dec 2016 01:38:51 +0000 (01:38 +0000)]
Merge "Fixed window ordering issue with TYPE_VOICE_INTERACTION."
Ben Lin [Tue, 13 Dec 2016 01:34:39 +0000 (01:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
TreeHugger Robot [Tue, 13 Dec 2016 01:34:21 +0000 (01:34 +0000)]
Merge "Make the onRequestRecommendation() method async."
Josh Gao [Tue, 13 Dec 2016 01:10:22 +0000 (01:10 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5 am:
15dc5951e6 am:
96446b5bd3
am:
19c4422c7c
Change-Id: I33a39902df365cf60cd5976d7977e18d36c09bc0
Felipe Leme [Tue, 13 Dec 2016 01:09:15 +0000 (01:09 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours am:
c398c0fc8d -s ours am:
f93437d683
am:
bc5f9ad9ff -s ours
Change-Id: I6ccc0774f8d4caa1c91d98bc1860df9180be0849
Jerry Zhang [Tue, 13 Dec 2016 01:08:08 +0000 (01:08 +0000)]
Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7 am:
88672d7d29" into nyc-mr2-dev-plus-aosp
am:
49950e68b2
Change-Id: I6d111eb8c4afef7cb0615153c2949b0a3cf2155d
Jerry Zhang [Tue, 13 Dec 2016 01:02:55 +0000 (01:02 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7 am:
88672d7d29
am:
11dc0eccfb
Change-Id: Ibafebe4877052595cb34626bde9ac6fba1983fb0
Android Build Merger (Role) [Tue, 13 Dec 2016 00:57:25 +0000 (00:57 +0000)]
Merge "Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am:
e40bb555d8 am:
0522f09bac -s ours"
Hugo Benichi [Tue, 13 Dec 2016 00:56:43 +0000 (00:56 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am:
e40bb555d8
am:
0522f09bac -s ours
Change-Id: I606e306f6ec68ac015e32c5e3069cc6b2b32b50e
Android Build Merger (Role) [Tue, 13 Dec 2016 00:56:23 +0000 (00:56 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am:
a61684feb4 am:
bfaccfc360 -s ours"
TreeHugger Robot [Tue, 13 Dec 2016 00:56:03 +0000 (00:56 +0000)]
Merge "Untangle creation of Task from addition of AppToken in WM."
Hugo Benichi [Tue, 13 Dec 2016 00:55:38 +0000 (00:55 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am:
a61684feb4
am:
bfaccfc360 -s ours
Change-Id: I2ec804fa3148971cccb2a0f1b34be6f1d05ef56e
Josh Gao [Tue, 13 Dec 2016 00:55:32 +0000 (00:55 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5 am:
15dc5951e6
am:
96446b5bd3
Change-Id: I1d354df518f19d61eaa17e03fd696193464b6f7b
Felipe Leme [Tue, 13 Dec 2016 00:54:22 +0000 (00:54 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours am:
c398c0fc8d -s ours
am:
f93437d683
Change-Id: Ic77fec13bfac6f94b6297920fc304ad50af2ca8b
Hugo Benichi [Tue, 13 Dec 2016 00:47:17 +0000 (00:47 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev am:
d792f9d032
am:
05b1702f70
Change-Id: I7beccc9f82d7c9d111b8fe2eee1d0b7489b22db3
Hugo Benichi [Tue, 13 Dec 2016 00:46:22 +0000 (00:46 +0000)]
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe am:
eb5e9aa2ce
am:
a6ac3479af -s ours
Change-Id: Icf0b845af40e0ba9492abdbda464cd5af8328e0d
Hugo Benichi [Tue, 13 Dec 2016 00:45:31 +0000 (00:45 +0000)]
DO NOT MERGE NetworkMonitor metrics: add first validation information am:
dd22982e25
am:
a948fb6bdc -s ours
Change-Id: I8b82b58bdb3e07d56f90bdfcb51f6ef919694258
Android Build Merger (Role) [Tue, 13 Dec 2016 00:44:25 +0000 (00:44 +0000)]
Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7 am:
88672d7d29" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Tue, 13 Dec 2016 00:43:49 +0000 (00:43 +0000)]
DO NOT MERGE Captive portal systel log improvements am:
a4f17bcbdf
am:
3dc894e7fe -s ours
Change-Id: Id6c15e6ed64f460f7f08c7358c751c1ab6dc8d2e
Hugo Benichi [Tue, 13 Dec 2016 00:42:51 +0000 (00:42 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev am:
4efaee1d0f
am:
37c886fc6c -s ours
Change-Id: I588e21de6e4a369d9d37d7d206b5e791752c1904
Jerry Zhang [Tue, 13 Dec 2016 00:42:47 +0000 (00:42 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7
am:
88672d7d29
Change-Id: Ic083ac68e2a6acaa211cfb8baaf3b9ea0bbe47e2
Josh Gao [Tue, 13 Dec 2016 00:42:42 +0000 (00:42 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5
am:
15dc5951e6
Change-Id: I1e60464308807f09a4d89ee4c0fc1a007fb1be88
Hugo Benichi [Tue, 13 Dec 2016 00:41:50 +0000 (00:41 +0000)]
DO NOT MERGE APF: also drop any ICMPv6 RSs am:
0cc49bb5bc
am:
0c93055001 -s ours
Change-Id: I4be8f03f956e149f80868fc1b3e2d503b1989b33
Hugo Benichi [Tue, 13 Dec 2016 00:41:44 +0000 (00:41 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev
am:
e40bb555d8
Change-Id: I7981b678c7043b0680339178f5e3a86d456b60f2
Hugo Benichi [Tue, 13 Dec 2016 00:41:39 +0000 (00:41 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am:
a61684feb4
Change-Id: I2e79e9fb5d2324d2b008bc1e4263d3bdeaf3752d
Felipe Leme [Tue, 13 Dec 2016 00:41:15 +0000 (00:41 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours
am:
c398c0fc8d -s ours
Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411
Jerry Zhang [Tue, 13 Dec 2016 00:37:12 +0000 (00:37 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17
am:
830874dbe7
Change-Id: I930f006ffd7a429379638aa4f8268ed443a3696b
Josh Gao [Tue, 13 Dec 2016 00:36:54 +0000 (00:36 +0000)]
Merge "Add trace category for adb."
am:
6968d90dc5
Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1
Hugo Benichi [Tue, 13 Dec 2016 00:35:17 +0000 (00:35 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
am:
d792f9d032
Change-Id: I4974f56b4c47f55e337e7f0ca5fb5cbd35b581b1
Hugo Benichi [Tue, 13 Dec 2016 00:35:08 +0000 (00:35 +0000)]
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
am:
eb5e9aa2ce
Change-Id: I2e3d9794e56d434f838ead9f12ee4edc74a3d6f2
Hugo Benichi [Tue, 13 Dec 2016 00:34:19 +0000 (00:34 +0000)]
DO NOT MERGE NetworkMonitor metrics: add first validation information
am:
dd22982e25
Change-Id: I9540a8357fd44cfcb17b244c66e5883f3a1a100b
Hugo Benichi [Tue, 13 Dec 2016 00:32:46 +0000 (00:32 +0000)]
DO NOT MERGE Captive portal systel log improvements
am:
a4f17bcbdf
Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6
Hugo Benichi [Tue, 13 Dec 2016 00:31:21 +0000 (00:31 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev
am:
4efaee1d0f
Change-Id: I70780ebd72fc756a28d1d46ad4a029c29a75f9c4
Hugo Benichi [Tue, 13 Dec 2016 00:31:16 +0000 (00:31 +0000)]
DO NOT MERGE APF: also drop any ICMPv6 RSs
am:
0cc49bb5bc
Change-Id: I8788a2572bbf7e7b4004c8fb83aa22c560438db7
Felipe Leme [Tue, 13 Dec 2016 00:30:21 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
am:
ff93f927e4 -s ours
Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Add trace category for adb."
Hugo Benichi [Tue, 13 Dec 2016 00:27:32 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev
Jerry Zhang [Tue, 13 Dec 2016 00:26:33 +0000 (00:26 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
am:
1975240f17
Change-Id: I4b6532719b848ba4b595c8069ecbbd42e855382b
Hugo Benichi [Tue, 6 Dec 2016 06:36:30 +0000 (15:36 +0900)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Logging improvements to help debugging captive portal issues.
Test: manually tested
Bug:
33126342
(cherry picked from commit
87de0c206709d3a170649b535a973de8f9c0fb0c)
Change-Id: I3ac1773e07827194d854ebad4c27c48da106154b
Hugo Benichi [Tue, 13 Dec 2016 00:22:31 +0000 (00:22 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
* changes:
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
DO NOT MERGE NetworkMonitor metrics: add first validation information
DO NOT MERGE Captive portal systel log improvements
Hugo Benichi [Tue, 13 Dec 2016 00:21:43 +0000 (00:21 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev
Treehugger Robot [Tue, 13 Dec 2016 00:18:56 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
TreeHugger Robot [Tue, 13 Dec 2016 00:16:03 +0000 (00:16 +0000)]
Merge "libandroidfw: Make tests less flaky"
Jerry Zhang [Tue, 13 Dec 2016 00:12:04 +0000 (00:12 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
Winson Chung [Mon, 12 Dec 2016 22:27:21 +0000 (14:27 -0800)]
Only checking activity state to determine visibility when entering PiP.
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I5ed05ef9bdb15dc7975bd83ac2e0f4020b148ea2
Wale Ogunwale [Mon, 12 Dec 2016 22:47:05 +0000 (14:47 -0800)]
Fixed window ordering issue with TYPE_VOICE_INTERACTION.
WC.forAllWindows returns windows based on their token order in the
hierarchy and the non-app windows are ordered in the hierarchy based
on their types. For most window tokens their types is specified when
the token is added, but for some others we use the type of the first
window added to the token. This becomes a problem if various window
types are added to the same token (sys-ui I am looking at you...) and
someone adds another token with a window type that should be z-ordered
in-between the windows of the first token.
For now we work around the problem by collecting all the non-app windows
and making sure they are in order before return any window to the caller.
Long term we want to change sys-ui and other callers to use different
window tokens based on the window types they are adding.
Fixes:
33538278
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I83357975c87c704af9d0702c939ca99984462365
Xiaohui Chen [Mon, 12 Dec 2016 23:53:36 +0000 (23:53 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev am:
f400349eb9
am:
fd155450eb
Change-Id: Ib7fcf85791f117c09603f471a350b9019c25a73d
Xiaohui Chen [Mon, 12 Dec 2016 23:49:08 +0000 (23:49 +0000)]
sysui: add assets and dimentions for sw900dp am:
376b1756d4
am:
bb18d78ea1
Change-Id: I1340f23f5113c51b9fa1a34a5fab587aa44c8ecb
Xiaohui Chen [Mon, 12 Dec 2016 23:48:05 +0000 (23:48 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev
am:
f400349eb9
Change-Id: Id12cf6f0ea67266f5ee63ea03910980a1211f36d
Xiaohui Chen [Mon, 12 Dec 2016 23:42:50 +0000 (23:42 +0000)]
sysui: add assets and dimentions for sw900dp
am:
376b1756d4
Change-Id: I4df31eea74b4978a4e8711730507e5d26877431d
Xiaohui Chen [Mon, 12 Dec 2016 23:36:51 +0000 (23:36 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev
Felipe Leme [Mon, 12 Dec 2016 23:30:11 +0000 (23:30 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am:
d0fdf7aba3 -s ours am:
9f0030a98a -s ours am:
edb11059e7
am:
959f23f121 -s ours
Change-Id: I3ead232907bc9af7f409d6de6cfe10abc5479a1b
sghuman [Mon, 12 Dec 2016 23:24:07 +0000 (23:24 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java" am:
9d55f43719 am:
eaed9ef0b7 am:
60a850b670
am:
3339d5b120
Change-Id: Id8966b9d9ba127fe043b6110cb5556f15c56de54
Felipe Leme [Mon, 12 Dec 2016 23:24:00 +0000 (23:24 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am:
d0fdf7aba3 -s ours am:
9f0030a98a -s ours
am:
edb11059e7
Change-Id: Ifbe3d0abcdfe61f519fd3dfe7727d430534b4f61
sghuman [Mon, 12 Dec 2016 23:18:31 +0000 (23:18 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java" am:
9d55f43719 am:
eaed9ef0b7
am:
60a850b670
Change-Id: I2c3de5b2cb0d60fc4aef08256939b50e67d7aa53
Felipe Leme [Mon, 12 Dec 2016 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am:
d0fdf7aba3 -s ours
am:
9f0030a98a -s ours
Change-Id: Ifd564eb7e8260b0642805abf4621d77c0381a5a2
sghuman [Mon, 12 Dec 2016 23:12:36 +0000 (23:12 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java" am:
9d55f43719
am:
eaed9ef0b7
Change-Id: I0314c02497dcabd6f3fa1caeb665ff5ecb9a0f59
Felipe Leme [Mon, 12 Dec 2016 23:12:25 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
am:
d0fdf7aba3 -s ours
Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76
Wale Ogunwale [Fri, 9 Dec 2016 02:58:50 +0000 (18:58 -0800)]
Untangle creation of Task from addition of AppToken in WM.
Makes it easier to follow what is going on and also clean-up in
preparation of stand way for AM to interact with containers in WM.
Test: Existing tests pass and manual testing
Change-Id: I91754b6d974dce2f696453cdaed175efb0f10c73
sghuman [Mon, 12 Dec 2016 23:07:22 +0000 (23:07 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
am:
9d55f43719
Change-Id: I6f24c92a9638f91197a4d17bfdc3fbeeede3daf4
Treehugger Robot [Mon, 12 Dec 2016 23:00:17 +0000 (23:00 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
sghuman [Mon, 12 Dec 2016 22:53:18 +0000 (22:53 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
Sundeep Ghuman [Mon, 12 Dec 2016 22:36:03 +0000 (14:36 -0800)]
Fix erroneous constructor in ScoredNetwork.java
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
Felipe Leme [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]
DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.
BUG:
30839080
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from Ic192334389eed7596e1f7cb8ce98a5169262418c)
Change-Id: I90cf55ad948bbe0883473431f40201cf4206dc82
Felipe Leme [Wed, 10 Aug 2016 21:46:39 +0000 (14:46 -0700)]
DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest.
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.
This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.
Bug:
30764608
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from commit I53ff86fc9b64cb058846f1aefa244771630d9e1e)
Change-Id: Ia9cdb780cb0917477b310dc38d2e39731d6a7609
TreeHugger Robot [Mon, 12 Dec 2016 22:17:43 +0000 (22:17 +0000)]
Merge "init.start was renamed to ro.boottime.init"
Adam Lesinski [Mon, 12 Dec 2016 22:08:13 +0000 (14:08 -0800)]
libandroidfw: Make tests less flaky
Changing any of the test APKs could change resource IDs.
The resource IDs are all made public and assigned an ID
to avoid this issue.
Test: make libandroidfw_tests
Change-Id: Idd17c25f4ac86a0ad5b2b8da6f968e5d9b2346c1
Marie Janssen [Mon, 12 Dec 2016 21:51:46 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am:
47e1f497c0 -s ours am:
964f769d63 -s ours am:
2e4d0c765f
am:
33e5e06c23 -s ours
Change-Id: Iaa38e70d9bb19d29e813d8e18d0a9af8ff273974
Marie Janssen [Mon, 12 Dec 2016 21:46:06 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am:
47e1f497c0 -s ours am:
964f769d63 -s ours
am:
2e4d0c765f
Change-Id: I8a68cdea6ec1e227ac3b179b8b82221a38365f0c
Joe LaPenna [Mon, 12 Dec 2016 21:45:58 +0000 (21:45 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:
9b430e0395 am:
2bc66bf601 am:
b52989c736
am:
b0977f52a6
Change-Id: I3c1db8b94e35bc4bb3df17fa2e6e1a3af6683e4a
TreeHugger Robot [Mon, 12 Dec 2016 21:42:15 +0000 (21:42 +0000)]
Merge "Introduce TextClassificationManager."
Marie Janssen [Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am:
47e1f497c0 -s ours
am:
964f769d63 -s ours
Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e
Joe LaPenna [Mon, 12 Dec 2016 21:39:55 +0000 (21:39 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:
9b430e0395 am:
2bc66bf601
am:
b52989c736
Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
Dmitri Plotnikov [Mon, 12 Dec 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Adding "quiescent" reboot mechanism to support STB operators"
Marie Janssen [Mon, 12 Dec 2016 21:34:39 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
am:
47e1f497c0 -s ours
Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490
Joe LaPenna [Mon, 12 Dec 2016 21:34:30 +0000 (21:34 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:
9b430e0395
am:
2bc66bf601
Change-Id: Idaa23641c8e95890271c554dee0244702601a109
Joe LaPenna [Mon, 12 Dec 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
am:
9b430e0395
Change-Id: Ib14979d168f4e37ab2f8de0737abe94cc6c8b16d
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
Chris Craik [Mon, 12 Dec 2016 21:15:05 +0000 (21:15 +0000)]
Merge "Add Outline/RenderNode perf tests"
Treehugger Robot [Mon, 12 Dec 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
Jerome Gaillard [Mon, 12 Dec 2016 21:13:21 +0000 (21:13 +0000)]
Merge "Fix path to JUnit jar for IDEA module in layoutlib"
TreeHugger Robot [Mon, 12 Dec 2016 20:59:41 +0000 (20:59 +0000)]
Merge "Add more Skia pipeline unit tests."
Jason Monk [Mon, 12 Dec 2016 20:48:19 +0000 (20:48 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev am:
eb3623c7dd
am:
251e4283b1
Change-Id: I7f09e8c36d4a658dca94f239cf349cb5aec665b1
Jason Monk [Mon, 12 Dec 2016 20:47:16 +0000 (20:47 +0000)]
Fix animations for app QS tiles. am:
d2274f848c
am:
46f24b6707
Change-Id: Ibf818c7f003a9f79483b09b6b0e2f3756e0e563b
Jason Monk [Mon, 12 Dec 2016 20:46:13 +0000 (20:46 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev am:
50a3327bbf
am:
c07e5b5df9
Change-Id: I1cc3a86e98f0bbad282d8632c6a74147bc663960
Jason Monk [Mon, 12 Dec 2016 20:44:57 +0000 (20:44 +0000)]
Fix loading bar positioning. am:
76bf8eb3d6
am:
fe6e3dd735
Change-Id: I8f821d80c2ed7f7584b67f7b5801a38961d527a6
Fyodor Kupolov [Mon, 12 Dec 2016 20:41:16 +0000 (12:41 -0800)]
init.start was renamed to ro.boottime.init
Test: manual
Bug:
32780225
Change-Id: I07e593d5c1edab62e937a77916ab207ec17e8639
Jason Monk [Mon, 12 Dec 2016 20:33:57 +0000 (20:33 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev
am:
eb3623c7dd
Change-Id: Ifcc88360b7e059ce0dd9f40ea2d9107e36e3bb5a
Jason Monk [Mon, 12 Dec 2016 20:33:51 +0000 (20:33 +0000)]
Fix animations for app QS tiles.
am:
d2274f848c
Change-Id: I32fdb2e9047e402650e374024fcc7cb39b2a83f9
Josh Gao [Tue, 29 Nov 2016 18:57:01 +0000 (10:57 -0800)]
Add trace category for adb.
Bug: http://b/
31289465
Test: systrace
Change-Id: I765c55c264329227556ff25655e3f00c5c3e8b54
Jason Monk [Mon, 12 Dec 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev
am:
50a3327bbf
Change-Id: Ifbc58bd82744f6a0b06e3547d08026f68838465b
Jason Monk [Mon, 12 Dec 2016 20:31:56 +0000 (20:31 +0000)]
Fix loading bar positioning.
am:
76bf8eb3d6
Change-Id: Ibf167360200be9969c1c725d84e4b9b9e442f553
Jason Monk [Mon, 12 Dec 2016 20:22:19 +0000 (20:22 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev
Jason Monk [Mon, 12 Dec 2016 20:21:56 +0000 (20:21 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev
OSDN Git Service
