OSDN Git Service
Selim Cinek [Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
am:
5393a0e2d9
Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de
Chen Xu [Fri, 7 Apr 2017 16:03:02 +0000 (16:03 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
am:
31fcda576f
Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
TreeHugger Robot [Fri, 7 Apr 2017 15:59:12 +0000 (15:59 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
* changes:
Improved accessibility behavior of the notification shelf
Fixed a bug where the indeterminate progressbar janky
Chen Xu [Fri, 7 Apr 2017 15:53:07 +0000 (15:53 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
Bryce Lee [Fri, 7 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
am:
13acf25cfd
Change-Id: I58d215ae33994274a364ec71ba59bae25e0e1c12
Bryce Lee [Fri, 7 Apr 2017 14:58:13 +0000 (14:58 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
Michal Karpinski [Fri, 7 Apr 2017 14:51:29 +0000 (14:51 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
am:
ce7f931793
Change-Id: I40667aac08e8c6c5d2e31640a4667ea577cc8889
TreeHugger Robot [Fri, 7 Apr 2017 14:45:42 +0000 (14:45 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
am:
ca73ff016f
Change-Id: Ife1762e223269271110b5f2357edffaaeb013b1b
Daniel Nicoara [Fri, 7 Apr 2017 14:19:25 +0000 (14:19 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
am:
1daf6cca42
Change-Id: I1daad51d1b0d559e490da30510ba7aa99979666f
TreeHugger Robot [Fri, 7 Apr 2017 14:12:02 +0000 (14:12 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:11:35 +0000 (14:11 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 13:27:33 +0000 (13:27 +0000)]
Merge "Change requestWait API according to request" into oc-dev
am:
ca687ac39a
Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030
TreeHugger Robot [Fri, 7 Apr 2017 13:19:04 +0000 (13:19 +0000)]
Merge "Change requestWait API according to request" into oc-dev
Lorenzo Colitti [Fri, 7 Apr 2017 12:48:26 +0000 (12:48 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev
am:
087daa0da5
Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e
TreeHugger Robot [Fri, 7 Apr 2017 12:40:19 +0000 (12:40 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:38:35 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am:
59dd2ebfc1
Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Michal Karpinski [Fri, 7 Apr 2017 09:47:02 +0000 (10:47 +0100)]
Removed unused variables in PerformBackupTask#finalizeBackup()
The unused variables got left behind after changes in ag/
1841867.
Bug:
35994670
Test: it builds
Change-Id: Ic28719dafb83542d7e4c73cb48508d6792d10174
Jakub Pawlowski [Fri, 7 Apr 2017 07:14:36 +0000 (07:14 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am:
7bf58d5975 am:
909f3b108f
am:
bc095f035d
Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a
Jakub Pawlowski [Fri, 7 Apr 2017 07:05:32 +0000 (07:05 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am:
7bf58d5975
am:
909f3b108f
Change-Id: Iba1be10854f9f7c8fd1459150dfdc79ac8eac395
Jakub Pawlowski [Fri, 7 Apr 2017 06:57:30 +0000 (06:57 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am:
7bf58d5975
Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2
Treehugger Robot [Fri, 7 Apr 2017 06:44:48 +0000 (06:44 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
Bryce Lee [Fri, 7 Apr 2017 06:29:24 +0000 (06:29 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
am:
327c0b9f88
Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a
TreeHugger Robot [Fri, 7 Apr 2017 06:20:56 +0000 (06:20 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 05:57:18 +0000 (22:57 -0700)]
Expose package_verifier_user_consent to Instant Apps
Test: manual
Bug:
37119785
Change-Id: I0a6deb96f1267f3f80bcf017d898fcf365515353
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Add NETWORK_STACK permission
Add a new permission that only allows other system services to call
networking related methods. This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.
Bug:
36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
(cherry picked from commit
fa84050a7e51e2a6643ea242b43f16cd6e3114dd)
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Merge "Add NETWORK_STACK permission" am:
b23fabf3fd am:
09146fc440
am:
d6b2e7ac93
Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab
Lorenzo Colitti [Fri, 7 Apr 2017 05:04:49 +0000 (05:04 +0000)]
Merge "Add NETWORK_STACK permission" am:
b23fabf3fd
am:
09146fc440
Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8
Lorenzo Colitti [Fri, 7 Apr 2017 05:00:15 +0000 (05:00 +0000)]
Merge "Add NETWORK_STACK permission"
am:
b23fabf3fd
Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a
Lorenzo Colitti [Fri, 7 Apr 2017 04:51:13 +0000 (04:51 +0000)]
Merge "Add NETWORK_STACK permission"
Bryce Lee [Thu, 6 Apr 2017 17:27:53 +0000 (10:27 -0700)]
Do not make strong reference to Resources.
This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.
Change-Id: I60d767b52de7bbf769f6761f5a3301dd7aff6ddf
Fixes:
36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation
Hugo Benichi [Fri, 7 Apr 2017 03:54:47 +0000 (03:54 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
am:
8ce439a768
Change-Id: Ic5984629c83f4af4175a40b6cb70ad5741ca4e25
TreeHugger Robot [Fri, 7 Apr 2017 03:47:22 +0000 (03:47 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 03:25:37 +0000 (20:25 -0700)]
resolve merge conflicts of
3c002e45dda1 to oc-dev-plus-aosp
Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5
Android Build Merger (Role) [Fri, 7 Apr 2017 03:11:58 +0000 (03:11 +0000)]
Merge "Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14 am:
deb64ea13e am:
bdebc29751" into oc-dev-plus-aosp
Hugo Benichi [Fri, 7 Apr 2017 03:11:09 +0000 (03:11 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14 am:
deb64ea13e
am:
bdebc29751
Change-Id: I6ce46b76d20d8cad5badb5fd3714c42a70988a06
Felipe Leme [Fri, 7 Apr 2017 03:08:25 +0000 (03:08 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
am:
53b6f00dc5
Change-Id: I553c58613ea0b1ee933a40f5bcbf6c0c49c8b2dd
Amith Yamasani [Fri, 7 Apr 2017 03:06:50 +0000 (03:06 +0000)]
Merge "Log excessive remote callbacks" into oc-dev
am:
6c171f35be
Change-Id: I9c1703a6c9cff68ee5262c91380c4647a2a79812
Philip P. Moltmann [Fri, 7 Apr 2017 03:04:12 +0000 (03:04 +0000)]
Merge "Return inet addr for discoverable printers" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 03:03:41 +0000 (03:03 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14
am:
deb64ea13e
Change-Id: I8d9304663e8b5019b65bf048cc7a72e6e9e43043
Rebecca Silberstein [Thu, 23 Mar 2017 07:29:28 +0000 (00:29 -0700)]
Add NETWORK_STACK permission
Add a new permission that only allows other system services to call
networking related methods. This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.
Bug:
36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
Calin Juravle [Fri, 7 Apr 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev
am:
1fd46de245
Change-Id: Ie5591a52e947af61fc04a2b1f64a2fe370f5e657
TreeHugger Robot [Fri, 7 Apr 2017 03:00:01 +0000 (03:00 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:58:50 +0000 (02:58 +0000)]
Merge "Log excessive remote callbacks" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 02:56:11 +0000 (02:56 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
am:
d6933a6c14
Change-Id: I8f0fd26d6a9f036adc9cc895690aac27d4b8e9cd
Calin Juravle [Fri, 7 Apr 2017 02:53:19 +0000 (02:53 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev
Treehugger Robot [Fri, 7 Apr 2017 02:48:55 +0000 (02:48 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
Casey Burkhardt [Fri, 7 Apr 2017 02:45:28 +0000 (02:45 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev
am:
ecb5b5ccc3
Change-Id: I7aa9a6760ff74e35875aa24e86f88dc72603075b
Casey Burkhardt [Fri, 7 Apr 2017 02:40:11 +0000 (02:40 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev
Android Build Merger (Role) [Fri, 7 Apr 2017 02:38:23 +0000 (02:38 +0000)]
Merge "Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d am:
b960ee662c am:
f0928412b0" into oc-dev-plus-aosp
Hugo Benichi [Fri, 7 Apr 2017 02:37:44 +0000 (02:37 +0000)]
Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d am:
b960ee662c
am:
f0928412b0
Change-Id: If83fae5f70cb2e253a4107591f43d9ce2d648006
Chad Brubaker [Fri, 7 Apr 2017 02:37:36 +0000 (02:37 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
am:
c56d782e13
Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc
Hugo Benichi [Fri, 7 Apr 2017 02:29:44 +0000 (02:29 +0000)]
Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d
am:
b960ee662c
Change-Id: If4985a8d51c03ea6cc3be121962bbf27f980fdc7
TreeHugger Robot [Fri, 7 Apr 2017 02:28:19 +0000 (02:28 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "ConnectivityService: safer locking"
am:
b8dc7fbc6d
Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c
Hugo Benichi [Fri, 7 Apr 2017 02:10:45 +0000 (02:10 +0000)]
Merge "ConnectivityService: safer locking"
Jason Monk [Fri, 7 Apr 2017 01:49:16 +0000 (01:49 +0000)]
Merge "Tuner plugin settings updates" into oc-dev
am:
eaf6b3b193
Change-Id: If20613b2a78c70b073b00dfc33bd832e3c4b5dc9
Jason Monk [Fri, 7 Apr 2017 01:39:25 +0000 (01:39 +0000)]
Merge "Tuner plugin settings updates" into oc-dev
Steven Moreland [Fri, 7 Apr 2017 01:29:42 +0000 (01:29 +0000)]
Merge "Use hwservicemanager getTransport." am:
562ed84ff4 am:
9912ec4ca6
am:
ea377a967f -s ours
Change-Id: Idb0e7c9d95ade65922241316fe1c75b5cee56d98
Steven Moreland [Fri, 7 Apr 2017 01:24:38 +0000 (01:24 +0000)]
Merge "Use hwservicemanager getTransport." am:
562ed84ff4
am:
9912ec4ca6
Change-Id: I08c33de1eb82b6717b4a9d4d76211dd0fa638d52
Tima Vaisburd [Fri, 7 Apr 2017 01:24:36 +0000 (01:24 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev
am:
be41b61216
Change-Id: Ib119a90509998347b6ad26862ddfdb2d5299fb42
TreeHugger Robot [Fri, 7 Apr 2017 01:18:55 +0000 (01:18 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev
Steven Moreland [Fri, 7 Apr 2017 01:18:36 +0000 (01:18 +0000)]
Merge "Use hwservicemanager getTransport."
am:
562ed84ff4
Change-Id: I39ee473166dce391f3cad4acf62821a4dfb9f444
Philip P. Moltmann [Thu, 6 Apr 2017 22:34:04 +0000 (15:34 -0700)]
Change requestWait API according to request
Test: USB Device CTSVerifier test
Change-Id: Ib55bed248d7b37c6f5f4a7be7ec2d90a7ac396c7
Fixes:
36555805
Steven Moreland [Fri, 7 Apr 2017 01:10:56 +0000 (01:10 +0000)]
Merge "Use hwservicemanager getTransport."
Felipe Leme [Fri, 7 Apr 2017 01:03:39 +0000 (18:03 -0700)]
Who wants...to live...forever? The "Save for Autofill?" dialog does!
Fixes:
37083017
Test: manual verification
Test: CtsAutoFillServiceTestCases pass
Change-Id: Id177fb59810956e4b43c1d357de415d64ab9d89a
Hugo Benichi [Thu, 6 Apr 2017 05:36:39 +0000 (14:36 +0900)]
NetworkMonitor: improve captive portal validation logs
This patch adds probe type and url to all validation logs about web
probes sent for captive portal detection.
Test: built, flashed, looked at $ adb shell dumpsys connectivity
Bug:
36830206,
36532213
Change-Id: Iee2caaf6664f3d097f9d1888ccc5fece0a95994c
Jason Monk [Fri, 7 Apr 2017 00:45:35 +0000 (00:45 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
am:
809b79da2f
Change-Id: I1e66207bb9c5fc882f3a8b41e44a6f85d894401b
Adrian Roos [Fri, 7 Apr 2017 00:39:42 +0000 (00:39 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
am:
ad27aa11b1
Change-Id: I4a74e401b9c4cdaeb0b27919b03e24b88855edb8
TreeHugger Robot [Fri, 7 Apr 2017 00:39:27 +0000 (00:39 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:38:23 +0000 (00:38 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
am:
d34076385d
Change-Id: I498941457eba58e39d1a57238ed3c7e66cb278e3
Calin Juravle [Fri, 7 Apr 2017 00:36:20 +0000 (00:36 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev
am:
31762dd9a0
Change-Id: Ifd344ec8396ebbd62940522e259ddc72b6e4f1c0
Andrii Kulian [Fri, 7 Apr 2017 00:32:24 +0000 (00:32 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev
am:
ff15be677b
Change-Id: Ib6e89adaaf759545efb050a599519eb3105754f1
TreeHugger Robot [Fri, 7 Apr 2017 00:26:30 +0000 (00:26 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
Phil Weaver [Fri, 7 Apr 2017 00:25:38 +0000 (00:25 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev
am:
3879a39ee6
Change-Id: Ifa3acdc07c4b9420fbb421587432b0c0aae203a2
Calin Juravle [Fri, 7 Apr 2017 00:24:21 +0000 (00:24 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:23:43 +0000 (00:23 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev
William Luh [Fri, 7 Apr 2017 00:09:34 +0000 (00:09 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev
am:
1b54760eee
Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2
TreeHugger Robot [Fri, 7 Apr 2017 00:08:20 +0000 (00:08 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev
William Luh [Fri, 7 Apr 2017 00:00:40 +0000 (00:00 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev
Hugo Benichi [Thu, 6 Apr 2017 23:53:25 +0000 (08:53 +0900)]
NetworkPolicyManagerService: turn off rule debugging
Left over from Change-Id Ic75d4f7a8853e6be20e51262c4b59805ec35093a.
Test: no functional changes
Bug:
37084734
Change-Id: Ifb10b4fe146bb6bea6260d8cd723a8e7f5b853a9
Patrik Torstensson [Thu, 6 Apr 2017 23:41:03 +0000 (23:41 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
am:
34cb00ac83
Change-Id: I2871b1f3edbf24c3a5b1ef49d432f5394198e6d7
Amith Yamasani [Thu, 6 Apr 2017 17:29:33 +0000 (10:29 -0700)]
Log excessive remote callbacks
Bug:
36778087
Test: N/A
Change-Id: Ifb02fe09e3c0869f7f6c741f886421064e5c1b8a
TreeHugger Robot [Thu, 6 Apr 2017 23:35:31 +0000 (23:35 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
Joel Fernandes [Thu, 6 Apr 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Set android.display thread to top-app cpusets and schedtune group" into oc-dev
am:
5362f10dad
Change-Id: I4993d49f7bcf9606e7676b17f7dacbc0e457e061
Dongwon Kang [Thu, 6 Apr 2017 22:56:24 +0000 (22:56 +0000)]
Merge "Add intent to intialize programs on APP installed" into oc-dev
am:
9c1e85384e
Change-Id: I806f2287b78670d3bcb8eef05c37e4581ad68985
TreeHugger Robot [Thu, 6 Apr 2017 22:51:38 +0000 (22:51 +0000)]
Merge "Set android.display thread to top-app cpusets and schedtune group" into oc-dev
Tima Vaisburd [Thu, 6 Apr 2017 22:50:05 +0000 (15:50 -0700)]
Added onMovedToDisplay method to WebView
Delegate the action to WebViewProvider, by default it is no-op.
Bug:
36006397
Test: There is no implementation yet to test.
Change-Id: Ib5101d3669a92ae81cfb34cc5db607c374712a3d
Dongwon Kang [Thu, 6 Apr 2017 22:49:46 +0000 (22:49 +0000)]
Merge "Add intent to intialize programs on APP installed" into oc-dev
Felipe Leme [Thu, 6 Apr 2017 22:48:35 +0000 (22:48 +0000)]
Merge "Don't start a partition when session is pending FillResponse authentication." into oc-dev
am:
6f5db9a2a8
Change-Id: If5cbb0c7b3617f66aa823859af971358f1c01ccf
TreeHugger Robot [Thu, 6 Apr 2017 22:41:59 +0000 (22:41 +0000)]
Merge "Don't start a partition when session is pending FillResponse authentication." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 20:59:15 +0000 (13:59 -0700)]
NotiViewWrapper: Fix test that breaks on master
oc-dev allows constructing views with a null context, but
that doesn't work any longer on master.
Bug:
36430936
Change-Id: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Merged-In: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Wale Ogunwale [Thu, 6 Apr 2017 22:40:35 +0000 (22:40 +0000)]
Merge "Preserve app window when it requests a relaunch" into oc-dev
am:
9e96ecfe9c
Change-Id: I871a8a09eaa25898e4de0a6dc1155bfe02e52f10
jackqdyulei [Thu, 6 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add lower case charging string." into oc-dev
am:
e263940142
Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
TreeHugger Robot [Thu, 6 Apr 2017 22:32:35 +0000 (22:32 +0000)]
Merge "Preserve app window when it requests a relaunch" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Add lower case charging string." into oc-dev
Felipe Leme [Thu, 6 Apr 2017 22:30:09 +0000 (22:30 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev
am:
7a7c0ace82
Change-Id: I538be771db63f10a6383495147c32848fabe55cd
Steven Moreland [Thu, 6 Apr 2017 22:28:30 +0000 (22:28 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev
am:
610b55e8bc
Change-Id: I38941d30137bc8ff525d8acc9a4cd04d5d59d975
OSDN Git Service
