OSDN Git Service
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
Erik Kline [Tue, 17 Jan 2017 05:09:33 +0000 (05:09 +0000)]
Merge "Move tests added in n-mr2 into new aosp location." am:
5511f7cfc2
am:
ac6e0cc770
Change-Id: I9f6c96c47ae63e4f812427317592e9994b1d72fd
Erik Kline [Tue, 17 Jan 2017 05:08:24 +0000 (05:08 +0000)]
Move tests added in n-mr2 into new aosp location. am:
e446acf954
am:
88f3295464
Change-Id: Iaf574661aa658df1285f69bfad62285bd531206a
Erik Kline [Tue, 17 Jan 2017 05:01:52 +0000 (05:01 +0000)]
Merge "Move tests added in n-mr2 into new aosp location."
am:
5511f7cfc2
Change-Id: I30161c31529fc0c5254353f4329cbd5165fcbd82
Erik Kline [Tue, 17 Jan 2017 05:01:49 +0000 (05:01 +0000)]
Move tests added in n-mr2 into new aosp location.
am:
e446acf954
Change-Id: I69c76aaf4c8d03ce4b33d9c16c47f2c83141e255
Erik Kline [Tue, 17 Jan 2017 04:56:55 +0000 (04:56 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests" am:
f9a28d7ba4 am:
4bb6f5a418
am:
5eba88cf44
Change-Id: I67c8df63d390ac77e626286a34e82b3bbc82c29e
Erik Kline [Tue, 17 Jan 2017 04:51:48 +0000 (04:51 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests" am:
f9a28d7ba4
am:
4bb6f5a418
Change-Id: I6a9106fd4fef85451104593ab8c37d4539cb9223
Treehugger Robot [Tue, 17 Jan 2017 04:49:07 +0000 (04:49 +0000)]
Merge "Move tests added in n-mr2 into new aosp location."
Erik Kline [Tue, 17 Jan 2017 04:46:17 +0000 (04:46 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"
am:
f9a28d7ba4
Change-Id: I2dade79427530a04c8e222e4ab2bf26e79ddd578
Treehugger Robot [Tue, 17 Jan 2017 04:38:21 +0000 (04:38 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"
Lorenzo Colitti [Tue, 17 Jan 2017 04:36:21 +0000 (04:36 +0000)]
Merge "Enable mobile data always on." am:
6e4fe6b37f am:
fcfa8c02ad
am:
cb44b8d85a
Change-Id: Iaf4f84f53be65800c95a4f1b456a0d2d142c8c87
Lorenzo Colitti [Tue, 17 Jan 2017 04:31:00 +0000 (04:31 +0000)]
Merge "Enable mobile data always on." am:
6e4fe6b37f
am:
fcfa8c02ad
Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94
Lorenzo Colitti [Tue, 17 Jan 2017 04:25:44 +0000 (04:25 +0000)]
Merge "Enable mobile data always on."
am:
6e4fe6b37f
Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7
Treehugger Robot [Tue, 17 Jan 2017 04:15:33 +0000 (04:15 +0000)]
Merge "Enable mobile data always on."
Erik Kline [Mon, 16 Jan 2017 07:27:22 +0000 (16:27 +0900)]
Start of UpstreamNetworkMonitor unittests
Test only the ConnectivityManager request and callback registering
and releasing. Testing behaviour triggered by activating these
callbacks will be in a separate change.
Test: runtest frameworks-net
Bug:
32163131
Change-Id: Ibfe66bbe2e61d81e8f13ac3b98e000d0d4534efa
Lorenzo Colitti [Tue, 17 Jan 2017 02:07:10 +0000 (11:07 +0900)]
Enable mobile data always on.
Test: has been on in fishfood several months.
Bug:
23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9
Tao Bao [Mon, 16 Jan 2017 18:36:43 +0000 (18:36 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()." am:
3b2fe9f7b9 am:
6bb3a9e6df
am:
5c610492c8
Change-Id: Ic9fa3bb8c7d4c04fa6e55b600cd7cccc9b186db1
Tao Bao [Mon, 16 Jan 2017 18:32:22 +0000 (18:32 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()." am:
3b2fe9f7b9
am:
6bb3a9e6df
Change-Id: I9919e1a37853290dc052a21267cea57ae2a0aacf
Tao Bao [Mon, 16 Jan 2017 18:27:39 +0000 (18:27 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."
am:
3b2fe9f7b9
Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04
Hisanobu Watanabe [Mon, 16 Jan 2017 18:22:27 +0000 (18:22 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" am:
ba17ea752b am:
92d16f70d7
am:
f9c48fad75
Change-Id: If2b80355bc3ebee6723a1f9b49bce1d267f0a085
Tao Bao [Mon, 16 Jan 2017 18:19:25 +0000 (18:19 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."
Hisanobu Watanabe [Mon, 16 Jan 2017 18:11:33 +0000 (18:11 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" am:
ba17ea752b
am:
92d16f70d7
Change-Id: I505d89ecfd486c1a1105bb2fe847d891ed540b6d
Polina Bondarenko [Mon, 16 Jan 2017 18:10:40 +0000 (18:10 +0000)]
Merge "Make TelephonyManager.getImei a system APIs." am:
dc61ad0ad8 am:
e2b306e30e
am:
d4c48e911e
Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
Polina Bondarenko [Mon, 16 Jan 2017 18:02:32 +0000 (18:02 +0000)]
Merge "Make TelephonyManager.getImei a system APIs." am:
dc61ad0ad8
am:
e2b306e30e
Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
Hisanobu Watanabe [Mon, 16 Jan 2017 17:59:55 +0000 (17:59 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"
am:
ba17ea752b
Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00
Polina Bondarenko [Mon, 16 Jan 2017 17:57:04 +0000 (17:57 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."
am:
dc61ad0ad8
Change-Id: Iaffe54fdf263eaf1cc248ceb0dad9b8787861475
Treehugger Robot [Mon, 16 Jan 2017 17:51:04 +0000 (17:51 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"
Treehugger Robot [Mon, 16 Jan 2017 17:49:58 +0000 (17:49 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."
Martijn Coenen [Mon, 16 Jan 2017 15:06:01 +0000 (15:06 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer." am:
c5e5442acd am:
b529858c0b
am:
714c8596ad
Change-Id: I792c4ac6a20e4665b152a5ebea1227b549cca7ef
Martijn Coenen [Mon, 16 Jan 2017 15:01:31 +0000 (15:01 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer." am:
c5e5442acd
am:
b529858c0b
Change-Id: I4a04a1e766551d0c15e3b4c14226363c97daf032
Martijn Coenen [Mon, 16 Jan 2017 14:56:57 +0000 (14:56 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."
am:
c5e5442acd
Change-Id: Ic5d73aba5da7bd74522a46d710465ebb67030d01
Martijn Coenen [Mon, 16 Jan 2017 14:48:09 +0000 (14:48 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."
Erik Kline [Fri, 16 Dec 2016 07:19:34 +0000 (16:19 +0900)]
Move tests added in n-mr2 into new aosp location.
Test: runtest frameworks-net
Change-Id: I3ca0d7e01a3f31be05d4a1a72a95c7e37a0a567e
Erik Kline [Mon, 16 Jan 2017 05:55:05 +0000 (05:55 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file" am:
8df5bd1028 am:
c498f6301e
am:
55d1997d51
Change-Id: Id51d28940e7ba95ee3896404d58ec2972f0e2ba7
Erik Kline [Mon, 16 Jan 2017 05:51:03 +0000 (05:51 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file" am:
8df5bd1028
am:
c498f6301e
Change-Id: I79421b04547c0ac3ea39d7222e21597668bddd49
Erik Kline [Mon, 16 Jan 2017 05:47:06 +0000 (05:47 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"
am:
8df5bd1028
Change-Id: I7973c74952efb1abe9309eedfdf829af39467463
Treehugger Robot [Mon, 16 Jan 2017 05:36:05 +0000 (05:36 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"
Hugo Benichi [Mon, 16 Jan 2017 05:13:01 +0000 (05:13 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am:
37727596cc am:
036ab4d193
am:
a5e0160f03
Change-Id: Ifc208e00e05efb29eaa2ab37abdc66d8c7ed8f4f
Hugo Benichi [Mon, 16 Jan 2017 05:04:39 +0000 (05:04 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am:
37727596cc
am:
036ab4d193
Change-Id: I839ed526e802b88bbed490b611f90d829b952f26
Hugo Benichi [Mon, 16 Jan 2017 05:00:30 +0000 (05:00 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
am:
37727596cc
Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295
Treehugger Robot [Mon, 16 Jan 2017 04:52:44 +0000 (04:52 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
Erik Kline [Fri, 13 Jan 2017 07:46:52 +0000 (16:46 +0900)]
Extract UpstreamNetworkMonitor to its own file
Test: as follows:
- built (bullhead)
- flashed
- booted
- runtest framworks-net passes
Bug:
32163131
Change-Id: I87ff041e008e45065c9722de8130df53684fb2a9
Hugo Benichi [Tue, 20 Dec 2016 08:05:06 +0000 (17:05 +0900)]
ConnectivityServiceTest: some fixes in CallbackInfo
- CallbackInfo becomes a static class so that it can be instantiated
and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
returns null when timing out, which was not failing the test cleanly.
Test: ConnectivityServiceTest passes
Bug:
32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085
Jesse Hall [Sun, 15 Jan 2017 05:58:41 +0000 (05:58 +0000)]
Create GraphicsEnvironment for communicating with driver loaders
am:
79bf392dc6 -s ours
Change-Id: I05f1376ac2fcf5ae59aac213b39bd3b8f4d02ed9
Jesse Hall [Mon, 12 Dec 2016 20:53:02 +0000 (12:53 -0800)]
Create GraphicsEnvironment for communicating with driver loaders
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.
Bug:
33531483
Test: various apps w/ and w/o driver package installed
Change-Id: I5820d3d1301d5461e10706f551b268c54d4f8926
(cherry picked from commit
b12249b67193df07a8ffc3cad0c41643662b887b)
Jesse Hall [Mon, 12 Dec 2016 20:53:02 +0000 (12:53 -0800)]
Create GraphicsEnvironment for communicating with driver loaders
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.
Bug:
33531483
Change-Id: I4e4e7fb21f1bcc67122e9173514af5f18c063991
Merged-In: I5820d3d1301d5461e10706f551b268c54d4f8926
Jesse Hall [Sat, 14 Jan 2017 06:03:34 +0000 (06:03 +0000)]
Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
am:
a959ccbc33 -s ours
Change-Id: I1ab396d5cfa65efa831ac4c7cfa5ec99fa7849a8
Jesse Hall [Sat, 14 Jan 2017 06:00:12 +0000 (06:00 +0000)]
Stop preloading EGL/GLES in Zygote
am:
93f630e1c3
Change-Id: Ia177980a2e97a50e7001068aee02372335c09497
TreeHugger Robot [Sat, 14 Jan 2017 05:54:14 +0000 (05:54 +0000)]
Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
Jesse Hall [Mon, 12 Dec 2016 05:22:16 +0000 (21:22 -0800)]
Stop preloading EGL/GLES in Zygote
It's not clear this actually makes much difference on modern
devices/drivers. With updatable graphics drivers, we'd have to be able
to unload the preloaded driver from processes that don't use the
system driver, which is additional complexity and risk.
On bullhead and sailfish, meminfo actually showed slightly more memory
available while sitting at launcher just after boot with this change
than previously. Looking at detailed stats, the differences appeared
to mostly within run-to-run variation, but there wasn't evidence of a
regression.
Bug:
33531483
Test: boot through lockscreen/launcher
Change-Id: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Merged-In: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Android Build Merger (Role) [Sat, 14 Jan 2017 04:03:28 +0000 (04:03 +0000)]
Merge "Merge "Add WearCellularMediatorService to the system server." into cw-f-dev am:
7a6c54128a am:
692089376b" into nyc-mr2-dev-plus-aosp
Wei Liu [Sat, 14 Jan 2017 04:02:50 +0000 (04:02 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev am:
7a6c54128a
am:
692089376b
Change-Id: I03f51ffef66b19616dd2f40cced2a165a9e39ba7
Wei Liu [Sat, 14 Jan 2017 04:01:24 +0000 (04:01 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev am:
7a6c54128a
am:
8ca47c7746
Change-Id: I7be81841000fc3de36c88abf2937212d8791bc1c
Wei Liu [Sat, 14 Jan 2017 03:58:32 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
am:
7a6c54128a
Change-Id: I5f905ec5bdd73d75bc84021125b4db5383ddfde1
Android Build Merger (Role) [Sat, 14 Jan 2017 03:58:21 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server. am:
d741f3de81 am:
e0d2c77a50" into nyc-mr2-dev-plus-aosp
Wei Liu [Sat, 14 Jan 2017 03:58:19 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
am:
7a6c54128a
Change-Id: Ide990adaf580e1e5b06a24484c13c090746d65fa
Wei Liu [Sat, 14 Jan 2017 03:57:00 +0000 (03:57 +0000)]
Add WearCellularMediatorService to the system server. am:
d741f3de81
am:
e0d2c77a50
Change-Id: I586eec797d0d6f5cf5b893c7cacb8028b0b511fa
Wei Liu [Sat, 14 Jan 2017 03:56:52 +0000 (03:56 +0000)]
Add WearCellularMediatorService to the system server. am:
d741f3de81
am:
6760890c38
Change-Id: I30d792533da4051300d15ee0567e4c09da68e21e
Wei Liu [Sat, 14 Jan 2017 03:51:58 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: I6f3f0e2ea19f995f81816689c80b0bc865cc991e
Wei Liu [Sat, 14 Jan 2017 03:51:52 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: Ica3d90c3748d79b28bf9cad1b3b5468f919e7299
TreeHugger Robot [Sat, 14 Jan 2017 03:46:06 +0000 (03:46 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
Wei Liu [Tue, 13 Dec 2016 23:44:55 +0000 (15:44 -0800)]
Add WearCellularMediatorService to the system server.
Bug:
33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2
Roozbeh Pournader [Sat, 14 Jan 2017 01:10:30 +0000 (01:10 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev
am:
0e099a283e
Change-Id: I2af561b25f9023bc7970d653386b6ca94430be73
Roozbeh Pournader [Sat, 14 Jan 2017 01:10:25 +0000 (01:10 +0000)]
Treat Latin American locales specially
am:
cf246af30d
Change-Id: I98ff3b1774e6cc3511fcd296d9cec5ccfce03c40
Yifan Hong [Sat, 14 Jan 2017 01:05:04 +0000 (01:05 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887 am:
051b14106f
am:
24b33094f6
Change-Id: I4781adad935ca77148226e0ed7df5f0b5b953daa
TreeHugger Robot [Sat, 14 Jan 2017 01:02:43 +0000 (01:02 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev
Yifan Hong [Sat, 14 Jan 2017 01:00:31 +0000 (01:00 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887
am:
051b14106f
Change-Id: I148771849faf22aabdcd3861e867913408d84c11
Yifan Hong [Sat, 14 Jan 2017 00:55:55 +0000 (00:55 +0000)]
Merge "BBinder -> BHwBinder."
am:
fe4d257887
Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8
Yifan Hong [Sat, 14 Jan 2017 00:49:22 +0000 (00:49 +0000)]
Merge "BBinder -> BHwBinder."
Sudheer Shanka [Sat, 14 Jan 2017 00:17:40 +0000 (00:17 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
am:
bdd0a2b14a
Change-Id: I4697f24ecef7cc439c94352ba2aaf98cf34bbe61
bohu [Sat, 14 Jan 2017 00:17:33 +0000 (00:17 +0000)]
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell
am:
d91dd06591
Change-Id: Ie178b790e11eb081857cd67c7f9af7fa95914868
Sudheer Shanka [Sat, 14 Jan 2017 00:10:05 +0000 (00:10 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
Muyuan Li [Fri, 13 Jan 2017 22:11:19 +0000 (22:11 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev
am:
659a650141
Change-Id: I9712d15884ab9bcf25bd8cf98e7881dc5d9871d4
Muyuan Li [Fri, 13 Jan 2017 22:11:14 +0000 (22:11 +0000)]
update navbar assets for sw900dp device.
am:
b3152ab966
Change-Id: I79b810a896ae17423b5fa36cac27a1933f2e758b
Chris Craik [Fri, 13 Jan 2017 22:07:52 +0000 (22:07 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
am:
4638ef17d5
Change-Id: I240d4b7397d06d3994fd17f4e3694ceef58c16f3
Chris Craik [Fri, 13 Jan 2017 22:07:43 +0000 (22:07 +0000)]
Support shadows and reordering in ViewOverlay
am:
36d9a6dfba
Change-Id: I1e7c33d68b5e2350b8b0ac589c46fdc250424b1a
Muyuan Li [Fri, 13 Jan 2017 21:49:51 +0000 (21:49 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev
Chris Craik [Fri, 13 Jan 2017 21:46:51 +0000 (21:46 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
Android Build Merger (Role) [Fri, 13 Jan 2017 21:27:22 +0000 (21:27 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
eadd29ffa6" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd
am:
eadd29ffa6
Change-Id: I1147b961e3413d845b4b95e7f2b0c2f6cd10dd65
Android Build Merger (Role) [Fri, 13 Jan 2017 21:26:25 +0000 (21:26 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:25:50 +0000 (21:25 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1
am:
9af145dcc4
Change-Id: I15cb7dbf619355f22f27e81aa1465683bac7e619
Android Build Merger (Role) [Fri, 13 Jan 2017 21:24:55 +0000 (21:24 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:24:22 +0000 (21:24 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd
am:
32992b4049
Change-Id: I2acaf1bd0a03e04611ec29cd9afd04e130e832d0
Android Build Merger (Role) [Fri, 13 Jan 2017 21:24:04 +0000 (21:24 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:23:27 +0000 (21:23 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1
am:
3c9b36482f
Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
Android Build Merger (Role) [Fri, 13 Jan 2017 21:23:07 +0000 (21:23 +0000)]
Merge changes from topic 'am-
72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
* changes:
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
0dfa7b58b8
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours am:
2288ee6b01
Philip P. Moltmann [Fri, 13 Jan 2017 21:22:16 +0000 (21:22 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4
am:
0dfa7b58b8
Change-Id: I64d9e83dbabdf1f3f3574cea135488cb86d4a2c1
Philip P. Moltmann [Fri, 13 Jan 2017 21:21:11 +0000 (21:21 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours
am:
2288ee6b01
Change-Id: Idcd4200ad47c5fd7d007b2a717941cec5db08595
Joachim Sauer [Fri, 13 Jan 2017 21:19:56 +0000 (21:19 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a am:
d05e19954b
am:
88002e8e38
Change-Id: I82a83e52e96bff1b43ca8bca7afe9b32877c3ecb
Erik Kline [Fri, 13 Jan 2017 21:17:39 +0000 (21:17 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e am:
a94e66868c
am:
21a148550d
Change-Id: I04b03ff7cee505e8322320ec3d0ee10e6dbf2b09
Andrew Scull [Fri, 13 Jan 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c
am:
b2db3761cd
Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87
Erik Kline [Fri, 13 Jan 2017 21:16:46 +0000 (21:16 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6 am:
7340e272c3
am:
ca6d265bbe
Change-Id: Ia761aeaa897538666cc690aac61092f38bb9b425
Andrew Scull [Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969
am:
3aac3ebee1
Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
Chen Xu [Fri, 13 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd am:
1d0877f59e
am:
c90dc2072c
Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
OSDN Git Service
