git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Robert Berry [Thu, 6 Jul 2017 12:04:47 +0000 (13:04 +0100)]

Improve logging when restore fails to load Package Manager.

When the transport has no more packages to return, #nextRestorePackage()
returns RestoreDescription.NO_MORE_PACKAGES. Instead of logging that it had
been unable to get the package metadata, the code in BackupManagerService
was assuming that this was a valid package but one with an unexpected
package name, and hence logged a confusing error message.

Bug: 37695157
Change-Id: I75f2123d2bb062ad04003d7ef2a3a25d9661338c
Test: manual

commit | commitdiff | tree

Guliz Tuncay [Wed, 12 Jul 2017 16:34:19 +0000 (16:34 +0000)]

Merge "TSMS updates settings properly in case of package changes"

commit | commitdiff | tree

Guliz Tuncay [Wed, 12 Jul 2017 16:33:02 +0000 (16:33 +0000)]

Merge "Clean up TSMS#setCurrentSpellCheckerLocked."

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Jul 2017 16:15:31 +0000 (16:15 +0000)]

Merge "Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21 am: 7776b49c13"

commit | commitdiff | tree

Neil Fuller [Wed, 12 Jul 2017 16:14:00 +0000 (16:14 +0000)]

Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21
am: 7776b49c13

Change-Id: I0ae1025d7382ca0dca3cf69d7362df38898ee048

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 16:13:51 +0000 (16:13 +0000)]

Merge "Update UCE service permissions' protection level from the old "signatureOrSystem" to "signature|privileged". Also: update some outdated protection level documentation in AndroidManifest.xml."

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 16:07:03 +0000 (16:07 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460 am: b63707c0ca -s ours
am: 47fa2c5fa7 -s ours

Change-Id: I35053b8e32b7ec14f87627c6158993535d490155

commit | commitdiff | tree

Neil Fuller [Wed, 12 Jul 2017 16:07:03 +0000 (16:07 +0000)]

Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac
am: 92189b6e21

Change-Id: I6b15cc75923cd712ca62302b8f797899ad43ad00

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 16:00:02 +0000 (16:00 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460
am: b63707c0ca -s ours

Change-Id: I4910aa2c3e1284b0959d576af99fa1ef7a0071bf

commit | commitdiff | tree

Neil Fuller [Wed, 12 Jul 2017 15:59:57 +0000 (15:59 +0000)]

Merge "Address further API review comments" am: b279ec51b6
am: cf8e06c0ac

Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 15:53:04 +0000 (15:53 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2
am: e5e3bdd460

Change-Id: I6e9bdfa3632ffa9abace5823c0982440f269a2c1

commit | commitdiff | tree

Neil Fuller [Wed, 12 Jul 2017 15:52:20 +0000 (15:52 +0000)]

Merge "Address further API review comments"
am: b279ec51b6

Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 15:47:59 +0000 (15:47 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
am: b27c5e92a2

Change-Id: Ibb5f53e5e81c7969ae8edf73a42d11cd8505b0d4

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 15:40:00 +0000 (15:40 +0000)]

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev am: fcceb3ada4
am: a7534f20cd

Change-Id: I7c7675922a561a4642120df51715a550dab7f503

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 15:37:40 +0000 (15:37 +0000)]

Merge "Address further API review comments"

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 15:36:18 +0000 (15:36 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 15:32:58 +0000 (15:32 +0000)]

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
am: fcceb3ada4

Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 15:23:04 +0000 (15:23 +0000)]

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev

commit | commitdiff | tree

Evan Laird [Wed, 12 Jul 2017 15:17:16 +0000 (15:17 +0000)]

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev am: ea0beea5dd
am: ca07589a0a

Change-Id: I693532da82e2edba31069be1dd4ad257dec2c389

commit | commitdiff | tree

Evan Laird [Wed, 12 Jul 2017 15:16:00 +0000 (15:16 +0000)]

Merge "Update animations in QS" into oc-dr1-dev am: 497d73f35e
am: 11aba31e55

Change-Id: I466859df9f6b557060bb36eb3878896be438d9d1

commit | commitdiff | tree

Evan Laird [Wed, 12 Jul 2017 15:07:38 +0000 (15:07 +0000)]

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
am: ea0beea5dd

Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33

commit | commitdiff | tree

Evan Laird [Wed, 12 Jul 2017 15:05:23 +0000 (15:05 +0000)]

Merge "Update animations in QS" into oc-dr1-dev
am: 497d73f35e

Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Jul 2017 14:59:33 +0000 (14:59 +0000)]

Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998 am: e49c3675fe"

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 14:58:27 +0000 (14:58 +0000)]

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998
am: e49c3675fe

Change-Id: Id089375a5699ac1157fc5f445876fee558d7bc7e

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 14:58:20 +0000 (14:58 +0000)]

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 14:58:04 +0000 (14:58 +0000)]

Merge "Update animations in QS" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 14:57:48 +0000 (14:57 +0000)]

Merge "Fix Handler.Callback.handleMessage javadoc."

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 14:51:35 +0000 (14:51 +0000)]

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
am: 49a16f0998

Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 14:43:53 +0000 (14:43 +0000)]

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]

Add OffloadHardwareInterface.getForwardedStats() wrapper

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit 9a5b02a89c02d5ff633d8456b22d3d5b7a15bd44)

Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 14:22:19 +0000 (14:22 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev am: 9df88e1fe7
am: 154bcbe518

Change-Id: I41f837e16eff9a4cd763d65155bd9b5d5d980acd

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Jul 2017 14:15:32 +0000 (14:15 +0000)]

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda88
am: fb8e9add4b

Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 14:15:29 +0000 (14:15 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
am: 9df88e1fe7

Change-Id: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Jul 2017 14:07:21 +0000 (14:07 +0000)]

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am: f33b1eda88

Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 14:06:52 +0000 (14:06 +0000)]

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Jul 2017 14:01:51 +0000 (14:01 +0000)]

resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp
am: dbdf7c1484

Change-Id: I29bff92b43e0662f11823c795036e41e51477017

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Jul 2017 12:57:33 +0000 (12:57 +0000)]

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]

Add OffloadHardwareInterface.getForwardedStats() wrapper

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Change-Id: Id831bc99cadbd59d280b026866707dbbe3b0e542

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Jul 2017 11:41:21 +0000 (20:41 +0900)]

resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp

Test: make -j64 framework services
Change-Id: I00460c8fe606fdce1f121685919d9a2e54febe5a

commit | commitdiff | tree

Narayan Kamath [Wed, 12 Jul 2017 10:51:22 +0000 (10:51 +0000)]

Merge "Binder: Don't attempt to catch OutOfMemoryError"

commit | commitdiff | tree

Pavel Grafov [Fri, 10 Mar 2017 19:39:14 +0000 (19:39 +0000)]

Fix Handler.Callback.handleMessage javadoc.

Currently arguments and return value annotations are applied to the
whole interface and aren't rendered at all:
https://developer.android.com/reference/android/os/Handler.Callback.html#handleMessage(android.os.Message)

Test: nothing to test.
Change-Id: I8cb44f7a6c339971b770e9bf769efee8294b4d28
Bug:36127602

commit | commitdiff | tree

Philipp Weiß [Wed, 12 Jul 2017 09:05:08 +0000 (09:05 +0000)]

Merge "Skip empty bluetooth-page in QS when bluetooth is disallowed"

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Jul 2017 07:57:49 +0000 (07:57 +0000)]

Merge "Use RFC 7217 stable privacy addresses" into oc-dr1-dev

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 07:25:10 +0000 (07:25 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp am: 3425a6e5c7 -s ours
am: fc24e1c5af -s ours

Change-Id: Ib8317ac06817ad70f8883d97c98b94b4911b3577

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 07:14:03 +0000 (07:14 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
am: 3425a6e5c7 -s ours

Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 07:02:42 +0000 (07:02 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 06:44:28 +0000 (06:44 +0000)]

Merge "Instrument captive portal login activity" into oc-dev-plus-aosp am: 50c561a3db -s ours
am: d2e0cd827e -s ours

Change-Id: Id47ea62bad68a60e2689c2e66dfa7870760a9b1d

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:42:38 +0000 (06:42 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf am: c8b4ef85dc am: d21ad47d43 -s ours
am: 82e4d525e5 -s ours

Change-Id: Ida615e607fc39cbd704fa1c808ea65871fadcd74

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 06:34:05 +0000 (06:34 +0000)]

Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
am: 50c561a3db -s ours

Change-Id: I068db2d0b7e08f373ce2e1d7ed2618245cec6562

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:32:14 +0000 (06:32 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf am: c8b4ef85dc
am: d21ad47d43 -s ours

Change-Id: I0d755e5c6a8d89fe91706e1b06863d0fc660b245

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 06:29:01 +0000 (06:29 +0000)]

Merge "Instrument captive portal login activity" into oc-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:25:04 +0000 (06:25 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf
am: c8b4ef85dc

Change-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f

commit | commitdiff | tree

Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]

CaptivePortalLogin ignores some ssl errors.

This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.

This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.

Bug: 62332137
Test: manually tested with captive portal entwork.
Merged-In: I05378ed74e678829e46fbeee18df916ec6ec2856
Merged-In: Iff025d68b824eac2c30b9656fd2494338eb07eb3

(cherry pick from commit 22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dev-plus-aosp due to missing patch)

Change-Id: I4e1be381195a8d1e510fd62533039ab3cd441679

commit | commitdiff | tree

Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]

Instrument captive portal login activity

Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I55ea3c61842f16bf6a98e812fb6dc940f96f895c
Merged-In: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907

(cherry picked from commit c61dc92fc0619d101c4b789f6305012701cc47a0)

Change-Id: I89ca3dfc74d09b7b2d303c0eb01b7b9883b01a42

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 06:18:11 +0000 (06:18 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting"
am: 5bb30496cf

Change-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 06:06:07 +0000 (06:06 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting"

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 05:08:02 +0000 (05:08 +0000)]

Merge "Connectivity: Fix format arguments" am: ba8ab362ad am: 2a13286d8d am: ce4c57fd0e
am: 3fb3b6051e

Change-Id: I8b0734e5d786999e1b520164b78ed72f453185e0

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 05:00:56 +0000 (05:00 +0000)]

Merge "Connectivity: Fix format arguments" am: ba8ab362ad am: 2a13286d8d
am: ce4c57fd0e

Change-Id: Ia789f019394b7870994fcce8e64dee3b0501f7c1

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 04:53:54 +0000 (04:53 +0000)]

Merge "Connectivity: Fix format arguments" am: ba8ab362ad
am: 2a13286d8d

Change-Id: I7517abe404637f92d7e361033d2d609b981f05f4

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 04:48:10 +0000 (04:48 +0000)]

Merge "Connectivity: Fix format arguments"
am: ba8ab362ad

Change-Id: I844c7d1faea3dcc90cf9816cae984277d7525f15

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 04:35:34 +0000 (04:35 +0000)]

Merge "Connectivity: Fix format arguments"

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 04:34:51 +0000 (04:34 +0000)]

Merge "Ensure stream type valid in AudioService.isStreamMute"

commit | commitdiff | tree

Erik Kline [Fri, 7 Jul 2017 08:38:30 +0000 (17:38 +0900)]

Restructure use of absent tether_offload_disabled setting

This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.

Additionally: fix unittests with proper use of FakeSettingsProvider.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed with developer enabled and disabled
Bug: 29337859
Bug: 32163131
Bug: 63250751
(cherry picked from commit c87cd411843484225897ebdf91cd05073c1c5f35)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3

Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084

commit | commitdiff | tree

Di Lu [Wed, 12 Jul 2017 04:21:00 +0000 (04:21 +0000)]

Merge "Remove return value of ipSecAddSecurityAssociation" am: cd5c1161ab am: 38e72983a5 am: c554c2c1cb
am: 197aaf0a34

Change-Id: I77f2e8be5a3ce9fe1c8c49b2530a8955abf5b0cc

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 04:13:53 +0000 (04:13 +0000)]

Merge "Add first OWNERS files for core networking" am: 4066930a36 am: 531cae76fd am: 59de81533d
am: 5185c1ce92

Change-Id: I3d0b7bcc72c21485671602d1e6f185fbc7702fe2

commit | commitdiff | tree

Di Lu [Wed, 12 Jul 2017 04:13:52 +0000 (04:13 +0000)]

Merge "Remove return value of ipSecAddSecurityAssociation" am: cd5c1161ab am: 38e72983a5
am: c554c2c1cb

Change-Id: I94e533d415e0afdbd4be72536ec667513a32f025

commit | commitdiff | tree

Di Lu [Wed, 12 Jul 2017 04:08:24 +0000 (04:08 +0000)]

Merge "Remove return value of ipSecAddSecurityAssociation" am: cd5c1161ab
am: 38e72983a5

Change-Id: I08b1498e05321b8cda04f56d07a0a5f50260d7d2

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 04:07:18 +0000 (04:07 +0000)]

Merge "Add first OWNERS files for core networking" am: 4066930a36 am: 531cae76fd
am: 59de81533d

Change-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653

commit | commitdiff | tree

Di Lu [Wed, 12 Jul 2017 04:02:24 +0000 (04:02 +0000)]

Merge "Remove return value of ipSecAddSecurityAssociation"
am: cd5c1161ab

Change-Id: I3cf6dbc44af4934c34b074dccdfff77dede6a693

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 04:01:15 +0000 (04:01 +0000)]

Merge "Add first OWNERS files for core networking" am: 4066930a36
am: 531cae76fd

Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0

commit | commitdiff | tree

Hugo Benichi [Wed, 12 Jul 2017 03:54:57 +0000 (03:54 +0000)]

Merge "Add first OWNERS files for core networking"
am: 4066930a36

Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112

commit | commitdiff | tree

Eric Laurent [Wed, 12 Jul 2017 03:54:44 +0000 (03:54 +0000)]

Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev am: 09a93b9739
am: 5dbd36d6c2

Change-Id: Id3cffa56e203092a720f2ec34a6304880b83020a

commit | commitdiff | tree

Di Lu [Wed, 12 Jul 2017 03:53:57 +0000 (03:53 +0000)]

Merge "Remove return value of ipSecAddSecurityAssociation"

commit | commitdiff | tree

Eric Laurent [Wed, 12 Jul 2017 03:47:59 +0000 (03:47 +0000)]

Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev
am: 09a93b9739

Change-Id: Id77262dcf3f4fe46c8a080c7b5147161809c6332

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 03:41:57 +0000 (03:41 +0000)]

Merge "Add first OWNERS files for core networking"

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 03:38:14 +0000 (03:38 +0000)]

Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 03:19:48 +0000 (03:19 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev am: d8fdb26ebf
am: 9d9b5c22f1

Change-Id: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3

commit | commitdiff | tree

George Burgess IV [Wed, 12 Jul 2017 03:14:47 +0000 (03:14 +0000)]

Merge "app_main: silence static analyzer warnings" am: cf188f664a am: 8a4be2a6ae am: 5987ab35ca
am: 10307ebe1f

Change-Id: Ie8b629e97a95f6afd33dc52df71d2508467273e3

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 03:11:15 +0000 (03:11 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
am: d8fdb26ebf

Change-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7

commit | commitdiff | tree

Winson Chung [Wed, 12 Jul 2017 03:09:04 +0000 (03:09 +0000)]

Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev am: bd2682d056
am: 8701ee564d

Change-Id: Ifea5eec9aebf553b4b092835fd306176d532ecbe

commit | commitdiff | tree

George Burgess IV [Wed, 12 Jul 2017 03:07:46 +0000 (03:07 +0000)]

Merge "app_main: silence static analyzer warnings" am: cf188f664a am: 8a4be2a6ae
am: 5987ab35ca

Change-Id: Idc8694cc79e336bb93b38d25fbd7b25ca7a31f0b

commit | commitdiff | tree

Jack He [Wed, 12 Jul 2017 03:07:30 +0000 (03:07 +0000)]

Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev am: b822ad3e06 -s ours
am: 21c14de87f -s ours

Change-Id: I791e16d803948348f13b937dfd1331b56c25a971

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 03:05:18 +0000 (03:05 +0000)]

Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev

commit | commitdiff | tree

Winson Chung [Wed, 12 Jul 2017 03:02:44 +0000 (03:02 +0000)]

Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev
am: bd2682d056

Change-Id: I0dd3a57d7f2e87074f1bd5275c011116dcba1d9d

commit | commitdiff | tree

Jack He [Wed, 12 Jul 2017 03:02:10 +0000 (03:02 +0000)]

GATT: Expose opportunistic client API to Java am: 79bf7d755f -s ours
am: 850738d679 -s ours

Change-Id: I759ab98af3d1c2b8511e6d30b8e10b8d193c1cbd

commit | commitdiff | tree

Jack He [Wed, 12 Jul 2017 03:00:58 +0000 (03:00 +0000)]

Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
am: b822ad3e06 -s ours

Change-Id: Ib97a6200288808c35d30d86d8043284cf9e1437f

commit | commitdiff | tree

George Burgess IV [Wed, 12 Jul 2017 03:00:43 +0000 (03:00 +0000)]

Merge "app_main: silence static analyzer warnings" am: cf188f664a
am: 8a4be2a6ae

Change-Id: Ic7b6e1092261a0e76fc84b213166729ea3451166

commit | commitdiff | tree

George Burgess IV [Wed, 12 Jul 2017 02:54:24 +0000 (02:54 +0000)]

Merge "app_main: silence static analyzer warnings"
am: cf188f664a

Change-Id: Ibad16ec8fabb4edaaa832bc43505f81fefb10ec7

commit | commitdiff | tree

Winson Chung [Wed, 12 Jul 2017 02:53:59 +0000 (02:53 +0000)]

Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev

commit | commitdiff | tree

Jack He [Wed, 12 Jul 2017 02:53:22 +0000 (02:53 +0000)]

GATT: Expose opportunistic client API to Java
am: 79bf7d755f -s ours

Change-Id: I1a757066905894c1fb70f3010a723f37b43103d1

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 02:47:56 +0000 (02:47 +0000)]

Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 02:43:14 +0000 (02:43 +0000)]

Merge "app_main: silence static analyzer warnings"

commit | commitdiff | tree

qingxi [Wed, 12 Jul 2017 02:37:20 +0000 (02:37 +0000)]

Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev am: a249de50d1
am: a6536cc85e -s ours

Change-Id: I8d60f4a50c46df393774af38f7035ec027460099

commit | commitdiff | tree

qingxi [Wed, 12 Jul 2017 02:31:24 +0000 (02:31 +0000)]

Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev
am: a249de50d1

Change-Id: I784617e0c34275adc5d177e6728b4b2c86dc1f5d

commit | commitdiff | tree

Svet Ganov [Wed, 12 Jul 2017 02:23:43 +0000 (02:23 +0000)]

Merge "Avoid a race in autofill manager service." into oc-dr1-dev am: d622be1754
am: 55fbe549d5

Change-Id: If651c4d88017c439432dd93b21944fc43a36dfe3

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 02:17:42 +0000 (02:17 +0000)]

Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev

commit | commitdiff | tree

Svet Ganov [Wed, 12 Jul 2017 02:17:20 +0000 (02:17 +0000)]

Merge "Avoid a race in autofill manager service." into oc-dr1-dev
am: d622be1754

Change-Id: I1e94b6e3601078b9f999f5f33a3d8425035de8c2

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Jul 2017 02:09:00 +0000 (02:09 +0000)]

Merge "Avoid a race in autofill manager service." into oc-dr1-dev

commit | commitdiff | tree

jiabin [Wed, 12 Jul 2017 02:03:18 +0000 (02:03 +0000)]

Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev am: 4c66a1dd0d
am: 199ebcc5d2

Change-Id: I781602abeaeebfd548877b97c58a1f8b06553907

commit | commitdiff | tree

jiabin [Wed, 12 Jul 2017 01:56:45 +0000 (01:56 +0000)]

Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev
am: 4c66a1dd0d

Change-Id: I75bf198fe6d32ef3dcb4080b17d9f8fe2ab0dbce

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.