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

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

Erik Kline [Wed, 12 Jul 2017 17:57:15 +0000 (17:57 +0000)]

Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07
am: 009d42ffe0

Change-Id: I000020b5e1bca50b39c627a64fe98e0fd6d80b9e

commit | commitdiff | tree

Erik Kline [Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)]

Merge "Stop unnecessary tethering reconfigurations"
am: 8ad1c81b07

Change-Id: I261ae05664d620997d38ca40edaffd8ca11b308e

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 17:35:15 +0000 (17:35 +0000)]

Merge "Stop unnecessary tethering reconfigurations"

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

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 [Sat, 8 Jul 2017 11:36:37 +0000 (20:36 +0900)]

Stop unnecessary tethering reconfigurations

The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast.  Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 32163131
Bug: 63250751
Merged-In: Id089375a5699ac1157fc5f445876fee558d7bc7e
Merged-In: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
Merged-In: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
(cherry picked from commit 6ee73daa0aa90620e4b2cb13ead4b53d16f45010)

Change-Id: Ic51123e173cc29cfcb52210707f2a0f8d2ab2e3b

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

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

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 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

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:08:24 +0000 (04:08 +0000)]

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

Change-Id: I08b1498e05321b8cda04f56d07a0a5f50260d7d2

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

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

Merge "Remove return value of ipSecAddSecurityAssociation"

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

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

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

Merge "app_main: silence static analyzer warnings"

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 01:36:08 +0000 (01:36 +0000)]

Merge "IpSecService: Actually throw exception" am: 3eff26449f
am: c5f089e6d5

Change-Id: Iefbe52615c1795cf1757b1f7557daf26e1d560d3

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Jul 2017 01:29:47 +0000 (01:29 +0000)]

Merge "IpSecService: Actually throw exception"
am: 3eff26449f

Change-Id: I415b249d564c5ffdd2d9381b53a31dd6f6c18eab

commit | commitdiff | tree

Andreas Gampe [Tue, 11 Jul 2017 22:14:41 +0000 (15:14 -0700)]

Connectivity: Fix format arguments

Fix missing argument.

Bug: 19797138
Test: m
Change-Id: I5fdd2a453c0d7422e8c3e79c8dce2d0800ec45e9

commit | commitdiff | tree

Treehugger Robot [Wed, 12 Jul 2017 01:17:19 +0000 (01:17 +0000)]

Merge "IpSecService: Actually throw exception"

commit | commitdiff | tree

George Burgess IV [Wed, 12 Jul 2017 00:18:26 +0000 (17:18 -0700)]

app_main: silence static analyzer warnings

This silences two warnings:

frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak

frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak

As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.

Bug: 27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f

commit | commitdiff | tree

Hugo Benichi [Fri, 7 Jul 2017 02:55:41 +0000 (11:55 +0900)]

Add first OWNERS files for core networking

Covering
  core/java/android/net/
  core/java/com/android/server/net/
  packages/CaptivePortalLogin/
  services/core/java/com/android/server/
    ConnectivityService.java
    NsdServic.java
    NetworkManagementService.java
  services/core/java/com/android/server/connectivity/
  services/net/
  tests/net/

Android core networking files not covered:
  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
  services/core/proto/ipconnectivity.proto (path unique to aosp)

Bug: 63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa

commit | commitdiff | tree

Andreas Gampe [Tue, 11 Jul 2017 17:25:09 +0000 (10:25 -0700)]

IpSecService: Actually throw exception

Add a missing throw.

Bug: 19797138
Test: m
Test: Device boots
Change-Id: I6c6058ecc95a5b85da43a42bac2846c31cefc038

commit | commitdiff | tree

Jack He [Tue, 11 Jul 2017 20:37:36 +0000 (20:37 +0000)]

Merge "GATT: Expose opportunistic client API to Java" am: 782ba0aca8
am: f0efa2c810

Change-Id: I242ede1cfe035f51920a5a1cb90cf0616bae1e93

commit | commitdiff | tree

Jack He [Tue, 11 Jul 2017 20:23:53 +0000 (20:23 +0000)]

Merge "GATT: Expose opportunistic client API to Java"
am: 782ba0aca8

Change-Id: If29bc145c1947f2e10472565ae753696e8057dd1

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Jul 2017 20:15:17 +0000 (20:15 +0000)]

Merge "GATT: Expose opportunistic client API to Java"

commit | commitdiff | tree

Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]

GATT: Expose opportunistic client API to Java

* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.

Bug: 63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec

commit | commitdiff | tree

Neil Fuller [Tue, 11 Jul 2017 14:25:48 +0000 (15:25 +0100)]

Address further API review comments

Address further API review comments from API reviewer.

Bug: 31008728
Test: make droid
Change-Id: I0b3f6be9eaf69ffa8a6e73475f9c3a9ba3e343f2

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am: d23be95dd7 -s ours

Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 11:56:52 +0000 (11:56 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master

commit | commitdiff | tree

Bin Chen [Tue, 11 Jul 2017 11:17:15 +0000 (11:17 +0000)]

Merge "Fix typo in Parcel javadoc." am: ed0e6009df
am: d29e275b5b

Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162

commit | commitdiff | tree

Bin Chen [Tue, 11 Jul 2017 11:10:23 +0000 (11:10 +0000)]

Merge "Fix typo in Parcel javadoc."
am: ed0e6009df

Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]

Merge "Fix typo in Parcel javadoc."

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 10:24:22 +0000 (10:24 +0000)]

Merge "Instrument captive portal login activity" into stage-aosp-master
am: 858ed182d6 -s ours

Change-Id: Ia9a74f588f8600bf2e453d7e7f1b5e1a818c432d

commit | commitdiff | tree

Neil Fuller [Tue, 11 Jul 2017 10:16:54 +0000 (10:16 +0000)]

Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master
am: cb996b5574

Change-Id: I42513c054183772a27fb985cee66440a88003143

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 10:15:19 +0000 (10:15 +0000)]

Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
am: 6ab950dd5f

Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 10:11:39 +0000 (10:11 +0000)]

Merge "Instrument captive portal login activity" into stage-aosp-master

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 11 Jul 2017 10:08:59 +0000 (10:08 +0000)]

Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master

commit | commitdiff | tree

Neil Fuller [Tue, 11 Jul 2017 10:07:37 +0000 (10:07 +0000)]

Merge "Move column definitions to an inner class"
am: ab0bb48965

Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 10:06:03 +0000 (10:06 +0000)]

Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master

commit | commitdiff | tree

Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]

Merge "Move column definitions to an inner class"

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 07:25:32 +0000 (07:25 +0000)]

Merge "Fix for the missing focus in WebView form fields." am: 2708da7bf6 -s ours
am: 76ea0eb773

Change-Id: I4799a8a5a3cf3c68774f40a560a1198d9af61eb6

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 07:20:46 +0000 (07:20 +0000)]

Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
am: 369bbf5d05

Change-Id: I02802f762a62fc29ff383523d2c52ebd536a9715

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 07:16:21 +0000 (07:16 +0000)]

Merge "Fix for the missing focus in WebView form fields."
am: 2708da7bf6 -s ours

Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c

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.

(cherry pick from commit 22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into stage-aosp-master)

Change-Id: Iff025d68b824eac2c30b9656fd2494338eb07eb3

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]

Change-Id: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907

(cherry picked from commit c61dc92fc0619d101c4b789f6305012701cc47a0)

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 07:08:43 +0000 (07:08 +0000)]

Merge "New Metrics constants for captive portal related UI" into stage-aosp-master

commit | commitdiff | tree

Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]

Merge "Fix for the missing focus in WebView form fields."

commit | commitdiff | tree

susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]

Fix for the missing focus in WebView form fields.

This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.

Bug: 62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2

(cherry pick from commit 97640400c4aa6bf05d5606ea749b54ad63de97cd)

commit | commitdiff | tree

Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]

NetworkCapabilities: Added support for TRANSPORT_LOWPAN

This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689

(cherry pick from commit 557e0c38b98f66d6147206f23d24d8d73b09e3e5)

commit | commitdiff | tree

Hugo Benichi [Wed, 31 May 2017 02:11:37 +0000 (11:11 +0900)]

New Metrics constants for captive portal related UI

This patch adds 5 new constants in metrics_constants for counting
various UI interactions involving captive portals:
  - sign-in button in wifi network details card
  - captive portal login activity start up
  - captive portal login activity menu interactions (2 constants)
  - captive portal login activity auto-closes on portal dismissed

Bug: 34901696
Bug: 26303355
Test: compiled, flashed
Change-Id: I01e2f2942b9d0183512cfddb248e66d3e33418d3
Merged-In: I489e5f2f8ff27da60fed215fa5f51326933fd79e

(cherry pick from commit 11da42bbb63dba98515e6a3ca7c55e77cbb3c7bf)

commit | commitdiff | tree

Bill Yi [Tue, 11 Jul 2017 03:59:10 +0000 (03:59 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 88e9aa19e2 -s ours

Change-Id: Iac87034d218ebdefbe1879192148ad323388c87c

commit | commitdiff | tree

Bill Yi [Tue, 11 Jul 2017 03:52:20 +0000 (03:52 +0000)]

Import translations. DO NOT MERGE am: 48cf1d9768 -s ours
am: 829d7186d5 -s ours

Change-Id: Icf5cedc770c63dc8e5e41cb128d01135fe1596bf

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Jul 2017 03:50:19 +0000 (03:50 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Tue, 11 Jul 2017 03:43:57 +0000 (03:43 +0000)]

Import translations. DO NOT MERGE
am: 48cf1d9768 -s ours

Change-Id: If7328a10566daf60ac6da033923b1acbb307865f

commit | commitdiff | tree

Bin Chen [Tue, 11 Jul 2017 03:01:44 +0000 (11:01 +0800)]

Fix typo in Parcel javadoc.

Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823

commit | commitdiff | tree

Bill Yi [Mon, 10 Jul 2017 21:56:13 +0000 (14:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: I6f7c93454c795da3db06572b1cddf9691ec4ff8e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Mon, 10 Jul 2017 21:17:29 +0000 (14:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0d78e510a92213c8cd7bf2ba96e756418b79aba8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 18:18:01 +0000 (19:18 +0100)]

Move column definitions to an inner class

Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.

Bug: 31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]

Merge "Configure the package name of the updater app" am: ed3e6d47ff
am: e293f7ee0d

Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]

Merge "Configure the package name of the updater app"
am: ed3e6d47ff

Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]

Merge "Configure the package name of the updater app"

commit | commitdiff | tree

Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]

Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8
am: 97e7afe8d0

Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]

Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f
am: 03e304e4e8

Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]

Merge "Fix dumpsys output for staged install version" am: 7fc43b1fbd
am: d725e7aeab

Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745

commit | commitdiff | tree

Hugo Benichi [Mon, 10 Jul 2017 13:47:15 +0000 (13:47 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours
am: ae62bb1d41

Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21

commit | commitdiff | tree

Lorenzo Colitti [Mon, 10 Jul 2017 13:43:02 +0000 (13:43 +0000)]

Merge "Make failure to set addrgenmode a non-fatal error."
am: 9c170157a8

Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:40:49 +0000 (13:40 +0000)]

Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
am: c895fcef8f

Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1

commit | commitdiff | tree

Neil Fuller [Mon, 10 Jul 2017 13:39:10 +0000 (13:39 +0000)]

Merge "Fix dumpsys output for staged install version"
am: 7fc43b1fbd

Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855

commit | commitdiff | tree

Hugo Benichi [Mon, 10 Jul 2017 13:37:31 +0000 (13:37 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors."
am: d56856876f -s ours

Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186

commit | commitdiff | tree

Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]

Merge "Make failure to set addrgenmode a non-fatal error."

commit | commitdiff | tree

Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]

Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]

Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621

Test: Make
Bug: 62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60

commit | commitdiff | tree

Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]

Merge "Fix dumpsys output for staged install version"

commit | commitdiff | tree

Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]

Merge "CaptivePortalLogin ignores some ssl errors."

commit | commitdiff | tree

Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]

Make failure to set addrgenmode a non-fatal error.

Bug: 17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Sat, 8 Jul 2017 07:21:40 +0000 (07:21 +0000)]

Merge "Add more logging to the Tethering SharedLog" am: 839cc0433f
am: 0a76af09b1

Change-Id: Ie3bd8e8a5d8911303cead707e0485c78ea7d055c

commit | commitdiff | tree

Erik Kline [Sat, 8 Jul 2017 07:14:59 +0000 (07:14 +0000)]

Merge "Add more logging to the Tethering SharedLog"
am: 839cc0433f

Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c

commit | commitdiff | tree

Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]

Merge "Add more logging to the Tethering SharedLog"

commit | commitdiff | tree

Kouji Shiotani [Fri, 7 Jul 2017 21:34:32 +0000 (21:34 +0000)]

Merge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449
am: 1249e0a1b0

Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb

commit | commitdiff | tree

Kouji Shiotani [Fri, 7 Jul 2017 21:28:43 +0000 (21:28 +0000)]

Merge "Fix wrong array index bound in NotificationUsageStats"
am: 87e893a449

Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46

commit | commitdiff | tree

Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]

Merge "Fix wrong array index bound in NotificationUsageStats"

commit | commitdiff | tree

Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]

Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am: 1cdf4244f4

Change-Id: I295298edcd7f26df46edb71924fa63038a381619

commit | commitdiff | tree

Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]

Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help