OSDN Git Service
Holly Jiuyu Sun [Thu, 12 Jan 2017 01:34:03 +0000 (17:34 -0800)]
Change the default behavior when MCC/MNC changes.
By default, we don't restart the activity when MCC/MNC changes
even when they are not set in configChanges. If they want to
restart, set mcc or mnc in the new attribute restartOnConfigChanges.
Bug:
34258948
Test: Test in unit test(testGetActivityConfigChanges() in
PackageParserTest.java) and on real device with
changing the SIM card.
Change-Id: Icd6899597c9b8f2e5706e74373a0280d19150092
TreeHugger Robot [Tue, 17 Jan 2017 22:18:55 +0000 (22:18 +0000)]
Merge "New setting for recommendation request timeout."
Jesse Hall [Tue, 17 Jan 2017 22:17:48 +0000 (22:17 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev am:
31b755adea
am:
3181ba522d -s ours
Change-Id: I5cacc647fec776d1016183695106bb3cd6c92ec2
Jesse Hall [Tue, 17 Jan 2017 22:16:49 +0000 (22:16 +0000)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote" am:
e8ce1276e2
am:
881da84c6b -s ours
Change-Id: I209b572b4b38cfc4477d082023a0fde25a8f0ba8
TreeHugger Robot [Tue, 17 Jan 2017 22:14:50 +0000 (22:14 +0000)]
Merge changes Ida2ff860,I8f84b09f
* changes:
Implemented the async recommendation request call.
Async network recommendation requests.
Manu Cornet [Tue, 17 Jan 2017 22:13:55 +0000 (22:13 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev am:
a4b7d794b3
am:
d71e91b89c
Change-Id: I32570877d94441d0307b18d2e38d95800f298e9f
Manu Cornet [Tue, 17 Jan 2017 22:12:55 +0000 (22:12 +0000)]
2D Recents: Always use grid layout even in split view am:
c0432c63de
am:
1342e0e7cd
Change-Id: I8d9d57787e3adcebfd01b4466f90c8fa636b13c6
Jesse Hall [Tue, 17 Jan 2017 22:11:26 +0000 (22:11 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
am:
31b755adea
Change-Id: I948e9c9a60327b9d25b6b5712904c780a52fdafa
Jesse Hall [Tue, 17 Jan 2017 22:11:16 +0000 (22:11 +0000)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
am:
e8ce1276e2
Change-Id: Ib5f68ce3a05cdb6e6f1bba5f6a17d0848e9a27ab
Manu Cornet [Tue, 17 Jan 2017 22:06:09 +0000 (22:06 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev
am:
a4b7d794b3
Change-Id: I5ab24d4cb1f695672428ede37517846b9602ab72
Manu Cornet [Tue, 17 Jan 2017 22:06:02 +0000 (22:06 +0000)]
2D Recents: Always use grid layout even in split view
am:
c0432c63de
Change-Id: I79cda44ab6d3e3a17742f15e03eef419d88340ee
TreeHugger Robot [Tue, 17 Jan 2017 22:01:20 +0000 (22:01 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
Manu Cornet [Tue, 17 Jan 2017 21:58:05 +0000 (21:58 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev
Manu Cornet [Fri, 13 Jan 2017 17:21:26 +0000 (09:21 -0800)]
2D Recents: Always use grid layout even in split view
Simplify the logic a bit, and polish the algorithm to accommodate the
various layout possibilities.
Bug:
32101881
Test: Checked layout in all orientations, with and without split view
Change-Id: I4a6dd3f7f34664908294ddaf5ea516d8e258edbf
Glen Kuhne [Tue, 17 Jan 2017 21:38:25 +0000 (21:38 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
Sergei Vasilinetc [Tue, 17 Jan 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Prohibit rendering hardware bitmaps in software mode."
TreeHugger Robot [Tue, 17 Jan 2017 20:52:43 +0000 (20:52 +0000)]
Merge "Deprecate all inconvenient methods"
TreeHugger Robot [Tue, 17 Jan 2017 20:51:58 +0000 (20:51 +0000)]
Merge "Revert "Stop preloading EGL/GLES in Zygote""
Jeremy Joslin [Wed, 4 Jan 2017 01:31:23 +0000 (17:31 -0800)]
New setting for recommendation request timeout.
Added a new global setting, NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
to control the maximum amount of time a recommendation request can
take.
Updated the NetworkScoreService to monitor the value and to update
its cached copy on observed changes.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34060959
Change-Id: I7650ee024e53dbc856cf20d7520a6eb252c73bdf
Jeremy Joslin [Thu, 29 Dec 2016 22:49:38 +0000 (14:49 -0800)]
Implemented the async recommendation request call.
Implemented requestAsyncRecommendation() by introducing a Handler
implementation to handle requests that time out and a OneTimeCallback
class to prevent multiple callbacks from being sent back for the same
request.
Change-Id: Ida2ff860d78d86185ab9ab22232b5b6dc1e4b310
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33784158
Jeremy Joslin [Wed, 28 Dec 2016 23:56:46 +0000 (15:56 -0800)]
Async network recommendation requests.
Exposing a new hidden API method that allows network recommendations
to be requested asynchronously.
Test: Built & run.
BUG:
33784158
Change-Id: I8f84b09f43a6c5fae5d8f03ec01e75c25b4b62d6
Jesse Hall [Tue, 17 Jan 2017 20:34:14 +0000 (12:34 -0800)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
This reverts commit
93f630e1c3011a36f6560fd6115cf1a0e809c5e0.
Change has already been reverted in master, hence DO NOT MERGE.
Bug:
34348911
TreeHugger Robot [Tue, 17 Jan 2017 20:16:49 +0000 (20:16 +0000)]
Merge "Rewrite FingerprintService to use HIDL 2.1"
Ta-wei Yen [Tue, 17 Jan 2017 20:05:02 +0000 (20:05 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am:
68d03b23bb am:
ea0e111468 am:
89a85b0683
am:
9e3a4957fc -s ours
Change-Id: I3c47ef16a7c937fe2bebf49a7185249a26e64650
Ta-wei Yen [Tue, 17 Jan 2017 19:59:43 +0000 (19:59 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am:
68d03b23bb am:
ea0e111468
am:
89a85b0683
Change-Id: I24966bccbea07ac42d4199d71c59c76ae19c967a
Ta-wei Yen [Tue, 17 Jan 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am:
68d03b23bb
am:
ea0e111468
Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
Ta-wei Yen [Tue, 17 Jan 2017 19:47:24 +0000 (19:47 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
am:
68d03b23bb
Change-Id: Ib4cf1d7f986a5ed4cc761f9abc10609de0bd22ff
Jim Miller [Sat, 17 Dec 2016 02:38:53 +0000 (18:38 -0800)]
Rewrite FingerprintService to use HIDL 2.1
Bug:
33199080
Test: Fingerprint enroll, remove, unlock, fingerprint arbitration.
Change-Id: I8b98236ba81f053527ee74c8a189af1adfd17d55
Ta-wei Yen [Tue, 17 Jan 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
TreeHugger Robot [Tue, 17 Jan 2017 19:38:19 +0000 (19:38 +0000)]
Merge "Add constant for package verifier state."
Andrii Kulian [Tue, 17 Jan 2017 19:31:55 +0000 (19:31 +0000)]
Merge "Add unit tests for 180 degree rotation"
Andrii Kulian [Tue, 17 Jan 2017 19:31:55 +0000 (19:31 +0000)]
Merge "Relayout window when rotated landscape <-> seascape"
Android Build Merger (Role) [Tue, 17 Jan 2017 19:23:18 +0000 (19:23 +0000)]
Merge "Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928" into nyc-mr2-dev-plus-aosp am:
ab8ebeafa2"
Android Build Merger (Role) [Tue, 17 Jan 2017 19:22:56 +0000 (19:22 +0000)]
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928 am:
d061cf5f6c"
Randy Pan [Tue, 17 Jan 2017 19:22:07 +0000 (19:22 +0000)]
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928" into nyc-mr2-dev-plus-aosp
am:
ab8ebeafa2
Change-Id: Idc1f72f5e36d999cd3d7dbbb59a5b98cf1f4842d
Randy Pan [Tue, 17 Jan 2017 19:21:59 +0000 (19:21 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928
am:
d061cf5f6c
Change-Id: I1724e30ef5af246ddf5056533b3bc0321267a505
Android Build Merger (Role) [Tue, 17 Jan 2017 19:21:29 +0000 (19:21 +0000)]
Merge "Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am:
ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp am:
e0c2adaff4 -s ours"
TreeHugger Robot [Tue, 17 Jan 2017 19:21:22 +0000 (19:21 +0000)]
Merge "Add doc to Configuration.setTo() method"
Makoto Onuki [Tue, 17 Jan 2017 18:38:04 +0000 (10:38 -0800)]
Deprecate all inconvenient methods
Test: builds fine
Change-Id: I52a26d160cff44b2fa0f3a807d23a6ed586d16ce
Andrew Rossignol [Tue, 17 Jan 2017 19:20:27 +0000 (19:20 +0000)]
Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am:
ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp
am:
e0c2adaff4 -s ours
Change-Id: Ib29e0f949e2f9d6cd18d47f491acb91a7b43aa18
Andrew Rossignol [Tue, 17 Jan 2017 19:20:24 +0000 (19:20 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am:
ebf7abb19e -s ours
am:
12d23e7f0f -s ours
Change-Id: I6e20730a0aefe324a53b3565fd966d0112c5bfea
Andrew Rossignol [Tue, 17 Jan 2017 19:19:01 +0000 (19:19 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am:
2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp
am:
cb9d39e438 -s ours
Change-Id: I75af3d982854efe6a1b71cb5aa7d433c325a2f2b
Andrew Rossignol [Tue, 17 Jan 2017 19:18:56 +0000 (19:18 +0000)]
Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am:
2f6b711ffa -s ours
am:
2aa5a90c41 -s ours
Change-Id: I22cce16b01c767ab469da974c5c9d28edc522938
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 19:16:54 +0000 (19:16 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a" am:
751e3af81e am:
6b9cd13b05 am:
cc1074f6f4
am:
bc5fd99347
Change-Id: Ia67028ec5f41df5c4f2e357562e5ab7cc2166878
TreeHugger Robot [Tue, 17 Jan 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Add OFFSET and LENGTH args for paged queries."
Jesse Hall [Tue, 17 Jan 2017 18:17:41 +0000 (10:17 -0800)]
Revert "Stop preloading EGL/GLES in Zygote"
This reverts commit
9c9cc3e94dd3b07ebf2ab52f1837dd88a64a9b57.
Test: 5x adb shell am start -W -n com.google.android.calculator/com.android.calculator2.Calculator
Bug:
34306111
Change-Id: Iebb3c823613c97c4a2b0f1e72bcea01e4d519fc7
Tobias Thierer [Tue, 17 Jan 2017 19:10:43 +0000 (19:10 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60" am:
a2343a7e78 am:
d8d1d9682d am:
d6be4be618
am:
191806932e
Change-Id: Ifb7ff642d1bbcaea2b14b20327a9046dec952be7
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:45 +0000 (19:08 +0000)]
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am:
ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:00 +0000 (19:08 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am:
2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp
Randy Pan [Tue, 17 Jan 2017 19:07:59 +0000 (19:07 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591
am:
3d12f1b928
Change-Id: Id2d352f1f774a78bf389b6927591c778bb8eb072
Andrew Rossignol [Tue, 17 Jan 2017 19:07:05 +0000 (19:07 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
am:
ebf7abb19e -s ours
Change-Id: I6c185f604e899f27a5c75aae883fd15de11033da
Andrew Rossignol [Tue, 17 Jan 2017 19:06:57 +0000 (19:06 +0000)]
Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"
am:
2f6b711ffa -s ours
Change-Id: I0e6ab7884eaa534f22b4af51c83836aaf4e0956c
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 19:06:26 +0000 (19:06 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a" am:
751e3af81e am:
6b9cd13b05
am:
cc1074f6f4
Change-Id: I5a592a38d054665cfb4fe5f21bbf938556d42251
TreeHugger Robot [Tue, 17 Jan 2017 19:03:38 +0000 (19:03 +0000)]
Merge "Have better separation between adding, positioning, and reparenting task"
Randy Pan [Tue, 17 Jan 2017 18:48:00 +0000 (18:48 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b
am:
9db7223591
Change-Id: I50e0de71d4fc0de18d7bf0c21c4f1a2518530f36
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 18:46:25 +0000 (18:46 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a" am:
751e3af81e
am:
6b9cd13b05
Change-Id: Id77f008ca75d2570eb34d84950e24bac4e447df8
TreeHugger Robot [Tue, 17 Jan 2017 18:42:42 +0000 (18:42 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
Randy Pan [Tue, 17 Jan 2017 18:28:21 +0000 (18:28 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL"
am:
cdad7f334b
Change-Id: I16520e6aa16e49b33bf393e2cdc3bd1ae8f3fdc4
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a"
am:
751e3af81e
Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1
Phil Weaver [Tue, 17 Jan 2017 18:11:18 +0000 (18:11 +0000)]
Merge "Provide hint text to accessibility."
Randy Pan [Tue, 17 Jan 2017 18:10:01 +0000 (18:10 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL"
Treehugger Robot [Tue, 17 Jan 2017 17:55:16 +0000 (17:55 +0000)]
TreeHugger Robot [Tue, 17 Jan 2017 17:49:20 +0000 (17:49 +0000)]
Merge "Properly track fragments from pop operations."
TreeHugger Robot [Tue, 17 Jan 2017 17:48:33 +0000 (17:48 +0000)]
Merge "Fix focus problems when using optimized fragment transactions."
Wale Ogunwale [Fri, 13 Jan 2017 21:26:16 +0000 (13:26 -0800)]
Have better separation between adding, positioning, and reparenting task
Several methods in activity manager and window manager performed adding,
positioning, and reparenting a task operation and sometimes failed silently
when things don't work due the callers using the methods for a particular
operation, but getting a different operation due to programmer error.
This CL better separate the methods responsible for adding, positioning, and
reparenting a task and also fails hard when there is an error.
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: Manual testing existing PiP doesn't leave the device in a bad state.
Bug:
34260633
Change-Id: Id64367da30fc6214eb6f95b2bd5e58ed0e953a88
Ben Wagner [Tue, 17 Jan 2017 17:10:03 +0000 (17:10 +0000)]
Merge "Remove SkDevice.h includes."
TreeHugger Robot [Tue, 17 Jan 2017 17:06:56 +0000 (17:06 +0000)]
Merge "Move navigation bar logic to its own class"
Fabien Sanglard [Tue, 17 Jan 2017 16:34:01 +0000 (16:34 +0000)]
Merge "AAPT2: Convert Android.mk to Android.bp"
TreeHugger Robot [Tue, 17 Jan 2017 15:58:21 +0000 (15:58 +0000)]
Merge "Allow removing non-enabled profiles"
Jason Monk [Wed, 11 Jan 2017 14:21:56 +0000 (09:21 -0500)]
Move navigation bar logic to its own class
Start hacking away at PhoneStatusBar by trying to pull out
as much NavigationBar logic as possible.
Test: runtest systemui
Change-Id: I23b904428be31b91f0747fd60c9f6e0dd323eb44
TreeHugger Robot [Tue, 17 Jan 2017 14:01:17 +0000 (14:01 +0000)]
Merge "Readd missing null check"
TreeHugger Robot [Tue, 17 Jan 2017 12:04:47 +0000 (12:04 +0000)]
Merge "Unit tests for wipeData for a managed profile."
TreeHugger Robot [Tue, 17 Jan 2017 11:54:06 +0000 (11:54 +0000)]
Merge "Clarify what a "work lock screen" is"
Tobias Thierer [Tue, 17 Jan 2017 11:36:58 +0000 (11:36 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60" am:
a2343a7e78 am:
d8d1d9682d
am:
d6be4be618
Change-Id: Iebadb6be0a880ede9033f0cd03a4a53c7695dcb7
Tobias Thierer [Tue, 17 Jan 2017 11:21:01 +0000 (11:21 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60" am:
a2343a7e78
am:
d8d1d9682d
Change-Id: I04b50fee184ba129d986832bfadbee8325f9c56f
Tobias Thierer [Tue, 17 Jan 2017 11:05:24 +0000 (11:05 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60"
am:
a2343a7e78
Change-Id: Ic56a141a6ffad9c0080ac3d942d2b669f8ca37d5
Tobias Thierer [Tue, 17 Jan 2017 10:41:34 +0000 (10:41 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60"
Nicolas Prevot [Thu, 12 Jan 2017 10:52:50 +0000 (10:52 +0000)]
Unit tests for wipeData for a managed profile.
BUG:
31952368
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest
-w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: If3cf2fee3edf5b16fe169e65337f215544557815
Robin Lee [Tue, 17 Jan 2017 10:28:36 +0000 (10:28 +0000)]
Clarify what a "work lock screen" is
Change-Id: I285bfaac24e2733033e95139e0bf5661516ee2ae
Test: make -j30
Fix:
34263937
Diego Perez [Tue, 17 Jan 2017 10:21:38 +0000 (10:21 +0000)]
Merge changes I7d112dda,I4374faac,I3b773d07,I421b5495
* changes:
Adds test to collect performance metrics
Add Main back to run in buildbot
Refactor tests structure
Update Config.getTime method after the N release
Jorim Jaggi [Tue, 17 Jan 2017 10:15:37 +0000 (11:15 +0100)]
Readd missing null check
Test: adb shell am instrument -w -r
android.test.appsmoke/android.support.test.runner.AndroidJUnitRunner
Change-Id: I8f7c325cf73805ed7137792479f5f348c74f85e4
Fixes:
34333370
Donghyun Cho [Tue, 17 Jan 2017 07:20:23 +0000 (07:20 +0000)]
Merge "CEC: Use isConnected() to check ARC transmission feasibility"
Lorenzo Colitti [Tue, 17 Jan 2017 07:01:18 +0000 (07:01 +0000)]
Merge "Delete dead code." am:
cf59ff79c5 am:
d305a7c894 am:
8cf7169564
am:
bb79257dbf
Change-Id: I97102d587cfc8699fd36f18e4072a5baaa7e2d11
Erik Kline [Tue, 17 Jan 2017 07:00:08 +0000 (07:00 +0000)]
Merge "Move tests added in n-mr2 into new aosp location." am:
5511f7cfc2 am:
ac6e0cc770 am:
b1d4313777
am:
b4f96a3172
Change-Id: I04b0b4d9ddea904a03f66a14f0b6cdfcc4ca752b
Erik Kline [Tue, 17 Jan 2017 06:59:06 +0000 (06:59 +0000)]
Move tests added in n-mr2 into new aosp location. am:
e446acf954 am:
88f3295464 am:
4e9ffd6e91
am:
545049be25
Change-Id: I99dbe36c20f5a33f1607cd2f9c0a66ae3eee1331
Erik Kline [Tue, 17 Jan 2017 06:57:59 +0000 (06:57 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests" am:
f9a28d7ba4 am:
4bb6f5a418 am:
5eba88cf44
am:
abeb9205fe
Change-Id: Ib1f2f813eec62e702455d60946f7d4d789ff9c88
Lorenzo Colitti [Tue, 17 Jan 2017 06:56:53 +0000 (06:56 +0000)]
Merge "Enable mobile data always on." am:
6e4fe6b37f am:
fcfa8c02ad am:
cb44b8d85a
am:
59d48b7310
Change-Id: I8d61c1a22a702cbd23638d46dfad36365b29180c
Tao Bao [Tue, 17 Jan 2017 06:55:46 +0000 (06:55 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()." am:
3b2fe9f7b9 am:
6bb3a9e6df am:
5c610492c8
am:
448716eec1
Change-Id: Ib36b7e990e7ae545f6b58f7a425c8f9aa19ad9aa
Hisanobu Watanabe [Tue, 17 Jan 2017 06:54:16 +0000 (06:54 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" am:
ba17ea752b am:
92d16f70d7 am:
f9c48fad75
am:
d521b10c5f
Change-Id: I315ce05d3563cb167177e3908709950300591405
Polina Bondarenko [Tue, 17 Jan 2017 06:52:59 +0000 (06:52 +0000)]
Merge "Make TelephonyManager.getImei a system APIs." am:
dc61ad0ad8 am:
e2b306e30e am:
d4c48e911e
am:
55745eca73
Change-Id: I273a1a3ae6d59e52bae6c529a6c0ef43c904b78a
Martijn Coenen [Tue, 17 Jan 2017 06:50:39 +0000 (06:50 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer." am:
c5e5442acd am:
b529858c0b am:
714c8596ad
am:
098bbc455d
Change-Id: I44b1ed7a8561ee234d6a55a9ed02eb3876c4a7fc
Erik Kline [Tue, 17 Jan 2017 06:49:24 +0000 (06:49 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file" am:
8df5bd1028 am:
c498f6301e am:
55d1997d51
am:
4c9f111a6d
Change-Id: I8e487ef6b725f0380548fcb4af47e04b12eb5704
Hugo Benichi [Tue, 17 Jan 2017 06:48:05 +0000 (06:48 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am:
37727596cc am:
036ab4d193 am:
a5e0160f03
am:
2c05563e78 -s ours
Change-Id: I2877281247a78e4d814a1df8bea71fd3c37b1962
Lorenzo Colitti [Tue, 17 Jan 2017 06:08:28 +0000 (06:08 +0000)]
Merge "Delete dead code." am:
cf59ff79c5 am:
d305a7c894
am:
8cf7169564
Change-Id: Ia662fd845fcfb4ade631d8aacf6bcff3c92a1543
Lorenzo Colitti [Tue, 17 Jan 2017 06:02:30 +0000 (06:02 +0000)]
Merge "Delete dead code." am:
cf59ff79c5
am:
d305a7c894
Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7
Lorenzo Colitti [Tue, 17 Jan 2017 05:55:50 +0000 (05:55 +0000)]
Merge "Delete dead code."
am:
cf59ff79c5
Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3
Treehugger Robot [Tue, 17 Jan 2017 05:44:57 +0000 (05:44 +0000)]
Merge "Delete dead code."
Erik Kline [Tue, 17 Jan 2017 05:20:52 +0000 (05:20 +0000)]
Merge "Move tests added in n-mr2 into new aosp location." am:
5511f7cfc2 am:
ac6e0cc770
am:
b1d4313777
Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30
Erik Kline [Tue, 17 Jan 2017 05:19:56 +0000 (05:19 +0000)]
Move tests added in n-mr2 into new aosp location. am:
e446acf954 am:
88f3295464
am:
4e9ffd6e91
Change-Id: I3b4f9303c5d4495e4b8556b1db6d5cad5543a10c