OSDN Git Service
Narayan Kamath [Mon, 16 Jan 2017 13:28:44 +0000 (13:28 +0000)]
Merge "PackageParser: Disable package cache on "eng" builds."
Hugo Benichi [Mon, 16 Jan 2017 08:28:43 +0000 (08:28 +0000)]
Merge "IP connectivity metrics: fix tests"
Hugo Benichi [Tue, 20 Dec 2016 00:57:43 +0000 (09:57 +0900)]
Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.
Test: verified that the test fails when reintroducing the format String
bug.
Bug:
33737715
(cherry picked from commit
a865790a5b30a2d5e29e3d443e7b02a5d8aa01a4)
Change-Id: Ic2f23e860a17cb83b90edcfd2ba365134cacfe36
Hugo Benichi [Mon, 16 Jan 2017 05:42:56 +0000 (14:42 +0900)]
IP connectivity metrics: fix tests
Change
4e89a026292338761838b33fc83b250f3519819c did not update the unit
tests checking serialization of ipconnectivity.proto protobufs.
This patch updates the tests expectations to make them pass again
Test: $ runtest frameworks-net
Bug:
34232829
Change-Id: Iccc4e1a7714c9ce1eba995dc47a2961216efc87d
TreeHugger Robot [Mon, 16 Jan 2017 03:38:56 +0000 (03:38 +0000)]
Merge "GNSS O Features according to go/o-gps-hal"
gomo [Wed, 11 Jan 2017 21:20:13 +0000 (13:20 -0800)]
GNSS O Features according to go/o-gps-hal
Added "Tow Known" as a possible gnss measurement state. As well added Automatic Gain Control (AGC)
to allow jammer detection. Also added the GNSS carrier frequeny to SV status. Also added vertical
GPS position uncertainty, speed uncertainty and bearing uncertainty. Also propagate locaton new
fields to geofence engine.
Test: Existing unit tests still pass.
Change-Id: I472b2fd2516cb7614877dea4bb054a34f50844dc
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
Jean-Michel Trivi [Sat, 14 Jan 2017 23:39:08 +0000 (23:39 +0000)]
Merge "AudioPlaybackConfiguration has a player control interface"
TreeHugger Robot [Sat, 14 Jan 2017 17:12:53 +0000 (17:12 +0000)]
Merge "Send EXTRA_USER with DevicePolicy lock broadcasts"
Bartosz Fabianowski [Sat, 14 Jan 2017 12:58:16 +0000 (12:58 +0000)]
Merge "Add install reason"
TreeHugger Robot [Sat, 14 Jan 2017 08:30:18 +0000 (08:30 +0000)]
Merge "Update bluetooth device type icon color"
TreeHugger Robot [Sat, 14 Jan 2017 04:47:03 +0000 (04:47 +0000)]
Merge "Treble GNSS - Removing FlpHardwareProvider"
TreeHugger Robot [Sat, 14 Jan 2017 04:07:18 +0000 (04:07 +0000)]
Merge "Also scale down thumbnail in app transitions for grid recents"
TreeHugger Robot [Sat, 14 Jan 2017 03:57:05 +0000 (03:57 +0000)]
Merge "2D Recents: Make sure thumbnail fills task view in all orientations"
TreeHugger Robot [Sat, 14 Jan 2017 02:35:53 +0000 (02:35 +0000)]
Merge "Stop preloading EGL/GLES in Zygote"
Aurimas Liutikas [Sat, 14 Jan 2017 01:23:06 +0000 (01:23 +0000)]
Merge "Remove unused classes from com.android.internal.widget"
Roozbeh Pournader [Sat, 14 Jan 2017 01:16:43 +0000 (01:16 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev am:
0e099a283e
am:
bdb68feffd
Change-Id: Ic51c4a45b77e227ace457b9665050be99af56ffc
Roozbeh Pournader [Sat, 14 Jan 2017 01:15:30 +0000 (01:15 +0000)]
Treat Latin American locales specially am:
cf246af30d
am:
4115c64313
Change-Id: I3f6bb444b185df0998b3dc4e4aaa8e8db2db79cf
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
Yifan Hong [Sat, 14 Jan 2017 01:10:29 +0000 (01:10 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887 am:
051b14106f am:
24b33094f6
am:
1bc9d241f6
Change-Id: I872c4f18f1a9c8fa8247f9c2b0f40107c1b51daa
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:40:09 +0000 (00:40 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev am:
bdd0a2b14a
am:
3102b3c37f
Change-Id: Ia069a59715a6057aba0c742a806cf73fe85489f9
bohu [Sat, 14 Jan 2017 00:38:57 +0000 (00:38 +0000)]
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell am:
d91dd06591
am:
906a21ba08
Change-Id: I592165bf4b159a93c388bc55b0a930667fdc1377
Muyuan Li [Sat, 14 Jan 2017 00:38:04 +0000 (00:38 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev am:
659a650141
am:
8139b9f0dd
Change-Id: Ib0b87365a5dff779ff103b76f20aea559153c21a
Muyuan Li [Sat, 14 Jan 2017 00:37:01 +0000 (00:37 +0000)]
update navbar assets for sw900dp device. am:
b3152ab966
am:
dd804d6b3a
Change-Id: Ia6a13f26bee3341482bad0606afd670ca89d0cc3
Chris Craik [Sat, 14 Jan 2017 00:36:02 +0000 (00:36 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev am:
4638ef17d5
am:
f56832a949
Change-Id: I0dd2a5226276dc74addf01d683d2a64cb55fa9a4
Chris Craik [Sat, 14 Jan 2017 00:35:02 +0000 (00:35 +0000)]
Support shadows and reordering in ViewOverlay am:
36d9a6dfba
am:
2369a6d753
Change-Id: I1f6574a4b9a1d24ccd4fc78cbc7e3368d815f8f5
Andrew Scull [Sat, 14 Jan 2017 00:33:43 +0000 (00:33 +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
am:
e688b70eb2
Change-Id: I48bfc9548432bdf41021d956617b1b37cc3c46ff
Andrew Scull [Sat, 14 Jan 2017 00:33:31 +0000 (00:33 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
eadd29ffa6
am:
833bed16ba
Change-Id: I67c391cd59f53682267b98a4db961cc9f9cf08fa
Andrew Scull [Sat, 14 Jan 2017 00:31:59 +0000 (00:31 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4" into nyc-mr2-dev-plus-aosp
am:
6d85c8a833
Change-Id: I39820d0ae4d6f7b9c04451bb0969976004e6f133
Andrew Scull [Sat, 14 Jan 2017 00:31:51 +0000 (00:31 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4
am:
4c349b67aa
Change-Id: I4718d7e2c73a5f84ca43789a09db5f3ab9a6b5d6
Andrew Scull [Sat, 14 Jan 2017 00:30:22 +0000 (00:30 +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
am:
c697ffe98b
Change-Id: I79d4ec95100e09eb6225cbfe900bceb357ee6b71
Andrew Scull [Sat, 14 Jan 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049
am:
bc94427593
Change-Id: I7e3cc5845ddafa4299f3bec1c2d40c05a66ffa99
Andrew Scull [Sat, 14 Jan 2017 00:28:46 +0000 (00:28 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f" into nyc-mr2-dev-plus-aosp
am:
0877a45f02
Change-Id: I8b4a708f5204346e791f5450bfaa4501afa3704b
Andrew Scull [Sat, 14 Jan 2017 00:28:39 +0000 (00:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f
am:
8203155664 -s ours
Change-Id: I920c10e52faef95e0d3d55e075fdc85610b358c0
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
Jean-Michel Trivi [Fri, 6 Jan 2017 02:06:03 +0000 (18:06 -0800)]
AudioPlaybackConfiguration has a player control interface
An AudioPlaybackConfiguration contains an IPlayer
interface for system control of a player. It is not
exposed to non-system signature components.
AudioService, through PlaybackActivityMonitor, is monitoring
the death of the IPlayer so the matching player can get
unregistered in case it meets its maker.
Test: use vendor/google_toolbox/team/audio/cmds/ClPlaybackActivity
Bug:
30258418
Change-Id: Ibf3bceba91882ff16bffbf1219c55a1f89ccb13f
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
Zak Cohen [Fri, 13 Jan 2017 23:14:57 +0000 (23:14 +0000)]
Merge changes from topic 'vrmode'
* changes:
Set ui mode in UiModeManagerService to vrheadset when VR mode is enabled.
Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
Fan Zhang [Fri, 13 Jan 2017 22:40:36 +0000 (14:40 -0800)]
Update bluetooth device type icon color
Bug:
34205154
Test: visual
Change-Id: If694ab12fa23c2b8db9c8659549021d82146f36a
Manu Cornet [Fri, 13 Jan 2017 22:23:23 +0000 (14:23 -0800)]
2D Recents: Make sure thumbnail fills task view in all orientations
This is a manual cherrypick of change
1775039 because automerging had
conflicts.
Bug:
32101881
Test: Checked layout in various situations when switching orientation
Change-Id: I26eb92320e381504daf5c1f54dddd15ea4601ac9
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
Roger Xue [Fri, 13 Jan 2017 21:59:13 +0000 (21:59 +0000)]
Merge "move PreferenceController into settingLib/core"
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
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:55 +0000 (21:45 +0000)]
Merge changes from topic 'am-
72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
am:
7dfd0b9843
Change-Id: I8a7ab11326864e25a993c4e4daecc3c280adf1a2
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:49 +0000 (21:45 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
0dfa7b58b8
am:
af5875d1be
Change-Id: Ia85f754316e9f003dfffdfb17efa8622d49068f2
Philip P. Moltmann [Fri, 13 Jan 2017 21:44:50 +0000 (21:44 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours am:
2288ee6b01
am:
44ee186c79
Change-Id: I81498bb620cd0a2c3bfac8654d5536ed38ba4d4b
Manu Cornet [Fri, 13 Jan 2017 21:44:07 +0000 (13:44 -0800)]
Also scale down thumbnail in app transitions for grid recents
This is a manual cherrypick of change
1779235 since automerging had
conflicts.
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: I3dec10b2293ceb50bf02db2432766e5d34f91736
Joachim Sauer [Fri, 13 Jan 2017 21:41:52 +0000 (21:41 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a am:
d05e19954b am:
88002e8e38
am:
b26cc7f971
Change-Id: Ib52d788a1787fa3689c14135673de044e2a7c989
Erik Kline [Fri, 13 Jan 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e am:
a94e66868c am:
21a148550d
am:
c8c42637d9
Change-Id: Ia6a834e00d3f681dd7558d096f157f1c8f279bea
Erik Kline [Fri, 13 Jan 2017 21:39:45 +0000 (21:39 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6 am:
7340e272c3 am:
ca6d265bbe
am:
930ff60ca8
Change-Id: I307f0c83c09dd5962bd4b6e929083aff9f6f6f05
Chen Xu [Fri, 13 Jan 2017 21:38:45 +0000 (21:38 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd am:
1d0877f59e am:
c90dc2072c
am:
10839091d9
Change-Id: I2a09577e0912c1d6ff324f0471b4a2012656749a
Philip P. Moltmann [Fri, 13 Jan 2017 21:37:36 +0000 (21:37 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
764a7901e6
am:
1156bf1dc1
Change-Id: I4559bb240589f523ab035c42b09be2bf17fbe599
Philip P. Moltmann [Fri, 13 Jan 2017 21:36:33 +0000 (21:36 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e am:
0aa5138861 -s ours
am:
6a1dcd17e4
Change-Id: Iffc426e95d47559bf1a01e0cf4b9c5c0f160d33b
Justin Klaassen [Fri, 13 Jan 2017 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev am:
482ba6b831
am:
84d0b9ea6b
Change-Id: I52df2e1fd79db3b324406215c4d6b32dc832f2cd
Justin Klaassen [Fri, 13 Jan 2017 21:33:45 +0000 (21:33 +0000)]
Add support for carrier demo mode am:
b632c55469
am:
b4be8c8df1 -s ours
Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6
Rob Carr [Fri, 13 Jan 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Expose SurfaceControl method to screenshot to GraphicBuffer."
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
Philip P. Moltmann [Fri, 13 Jan 2017 21:15:18 +0000 (21:15 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc
am:
331a4bb8d4
Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
Philip P. Moltmann [Fri, 13 Jan 2017 21:14:41 +0000 (21:14 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4
am:
764a7901e6
Change-Id: I845318f60eadb6c31f9795024cf10df33a15dc20
Philip P. Moltmann [Fri, 13 Jan 2017 21:14:17 +0000 (21:14 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5
am:
889a420a9e -s ours
Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
Philip P. Moltmann [Fri, 13 Jan 2017 21:13:46 +0000 (21:13 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e
am:
0aa5138861 -s ours
Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
Justin Klaassen [Fri, 13 Jan 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev
am:
482ba6b831
Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186
Justin Klaassen [Fri, 13 Jan 2017 21:04:31 +0000 (21:04 +0000)]
Add support for carrier demo mode
am:
b632c55469
Change-Id: Ib8061ae05e5144a79921123ba6dfdaec81baaece
Pankaj Kanwar [Fri, 13 Jan 2017 21:03:17 +0000 (21:03 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev am:
ae9e15fa44
am:
074a166e28 -s ours
Change-Id: I2cc7c861011387e70557fdf110470db7a125bcd2
pkanwar [Fri, 13 Jan 2017 21:02:08 +0000 (21:02 +0000)]
DO NOT MERGE: Fix to maintain the Carrier Network connection. am:
e45b50293e
am:
07998e8e26 -s ours
Change-Id: I5fb03b65175cbfc8992ca72309d5de766bdf3ae9
Justin Klaassen [Fri, 13 Jan 2017 21:00:06 +0000 (21:00 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev
Pankaj Kanwar [Fri, 13 Jan 2017 20:58:15 +0000 (20:58 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
am:
ae9e15fa44
Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4
pkanwar [Fri, 13 Jan 2017 20:58:09 +0000 (20:58 +0000)]
DO NOT MERGE: Fix to maintain the Carrier Network connection.
am:
e45b50293e
Change-Id: I6a48b308cd461097a195a073249cde096cc74886
Pankaj Kanwar [Fri, 13 Jan 2017 20:45:59 +0000 (20:45 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
Andrew Sapperstein [Fri, 13 Jan 2017 20:33:36 +0000 (20:33 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev am:
409d93356c
am:
ace5aea996
Change-Id: Ie91752bfa32fa7b2b155bec84a985ad520f00844
Andrew Sapperstein [Fri, 13 Jan 2017 20:32:41 +0000 (20:32 +0000)]
Add logging for high temp warning. am:
6c08f8da09
am:
990826a0a1
Change-Id: Ife42afb4b41fe3f733f6f8b23d56d977e6edb7d7
Andrew Sapperstein [Fri, 13 Jan 2017 20:28:40 +0000 (20:28 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev
am:
409d93356c
Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
OSDN Git Service
