Commit Graph

322344 Commits

Author SHA1 Message Date
George Burgess IV
8a4be2a6ae Merge "app_main: silence static analyzer warnings"
am: cf188f664a

Change-Id: Ibad16ec8fabb4edaaa832bc43505f81fefb10ec7
2017-07-12 02:54:24 +00:00
Treehugger Robot
cf188f664a Merge "app_main: silence static analyzer warnings" 2017-07-12 02:43:14 +00:00
Andreas Gampe
c5f089e6d5 Merge "IpSecService: Actually throw exception"
am: 3eff26449f

Change-Id: I415b249d564c5ffdd2d9381b53a31dd6f6c18eab
2017-07-12 01:29:47 +00:00
Treehugger Robot
3eff26449f Merge "IpSecService: Actually throw exception" 2017-07-12 01:17:19 +00:00
George Burgess IV
c29844d072 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
2017-07-11 17:28:15 -07:00
Andreas Gampe
d6d8e452c1 IpSecService: Actually throw exception
Add a missing throw.

Bug: 19797138
Test: m
Test: Device boots
Change-Id: I6c6058ecc95a5b85da43a42bac2846c31cefc038
2017-07-11 14:52:37 -07:00
Jack He
f0efa2c810 Merge "GATT: Expose opportunistic client API to Java"
am: 782ba0aca8

Change-Id: If29bc145c1947f2e10472565ae753696e8057dd1
2017-07-11 20:23:53 +00:00
Treehugger Robot
782ba0aca8 Merge "GATT: Expose opportunistic client API to Java" 2017-07-11 20:15:17 +00:00
Jack He
13f52c8118 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
2017-07-11 18:02:52 +00:00
Hugo Benichi
d23be95dd7 Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master 2017-07-11 11:56:52 +00:00
Bin Chen
d29e275b5b Merge "Fix typo in Parcel javadoc."
am: ed0e6009df

Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd
2017-07-11 11:10:23 +00:00
Treehugger Robot
ed0e6009df Merge "Fix typo in Parcel javadoc." 2017-07-11 10:58:30 +00:00
Hugo Benichi
858ed182d6 Merge "Instrument captive portal login activity" into stage-aosp-master 2017-07-11 10:11:39 +00:00
Android Build Merger (Role)
cb996b5574 Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master 2017-07-11 10:08:59 +00:00
Neil Fuller
fb3804d720 Merge "Move column definitions to an inner class"
am: ab0bb48965

Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8
2017-07-11 10:07:37 +00:00
Hugo Benichi
6ab950dd5f Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master 2017-07-11 10:06:03 +00:00
Neil Fuller
ab0bb48965 Merge "Move column definitions to an inner class" 2017-07-11 10:01:01 +00:00
Hugo Benichi
76ea0eb773 Merge "Fix for the missing focus in WebView form fields."
am: 2708da7bf6  -s ours

Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c
2017-07-11 07:16:21 +00:00
Hugo Benichi
68092b7ade 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 22542ed480 which
was skipped from merging into stage-aosp-master)

Change-Id: Iff025d68b824eac2c30b9656fd2494338eb07eb3
2017-07-11 16:15:05 +09:00
Hugo Benichi
8fd2c7d745 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 c61dc92fc0)
2017-07-11 16:14:56 +09:00
Hugo Benichi
369bbf5d05 Merge "New Metrics constants for captive portal related UI" into stage-aosp-master 2017-07-11 07:08:43 +00:00
Hugo Benichi
2708da7bf6 Merge "Fix for the missing focus in WebView form fields." 2017-07-11 07:05:26 +00:00
susnata
7f1396d3f8 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 97640400c4)
2017-07-11 06:59:29 +00:00
Robert Quattlebaum
eadb452d72 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 557e0c38b9)
2017-07-11 15:52:37 +09:00
Hugo Benichi
0275780c6c 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 11da42bbb6)
2017-07-11 15:08:43 +09:00
Bin Chen
b6b12b567d Fix typo in Parcel javadoc.
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
2017-07-11 11:01:44 +08:00
Neil Fuller
d07c331349 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
2017-07-10 20:02:56 +01:00
Neil Fuller
e293f7ee0d Merge "Configure the package name of the updater app"
am: ed3e6d47ff

Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb
2017-07-10 14:26:32 +00:00
Neil Fuller
ed3e6d47ff Merge "Configure the package name of the updater app" 2017-07-10 14:14:46 +00:00
Lorenzo Colitti
97e7afe8d0 Merge "Make failure to set addrgenmode a non-fatal error."
am: 9c170157a8

Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee
2017-07-10 13:43:02 +00:00
Przemyslaw Szczepaniak
03e304e4e8 Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
am: c895fcef8f

Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
2017-07-10 13:40:49 +00:00
Neil Fuller
d725e7aeab Merge "Fix dumpsys output for staged install version"
am: 7fc43b1fbd

Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855
2017-07-10 13:39:10 +00:00
Hugo Benichi
ae62bb1d41 Merge "CaptivePortalLogin ignores some ssl errors."
am: d56856876f  -s ours

Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186
2017-07-10 13:37:31 +00:00
Treehugger Robot
9c170157a8 Merge "Make failure to set addrgenmode a non-fatal error." 2017-07-10 12:15:47 +00:00
Treehugger Robot
c895fcef8f Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" 2017-07-10 12:00:31 +00:00
Przemyslaw Szczepaniak
44d7cd06d2 Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug: 62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
2017-07-10 11:56:55 +00:00
Treehugger Robot
7fc43b1fbd Merge "Fix dumpsys output for staged install version" 2017-07-10 11:52:11 +00:00
Hugo Benichi
d56856876f Merge "CaptivePortalLogin ignores some ssl errors." 2017-07-10 11:42:45 +00:00
Lorenzo Colitti
00886760d7 Make failure to set addrgenmode a non-fatal error.
Bug: 17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
2017-07-10 19:10:35 +09:00
Hugo Benichi
22542ed480 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.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856
2017-07-10 14:24:47 +09:00
Erik Kline
0a76af09b1 Merge "Add more logging to the Tethering SharedLog"
am: 839cc0433f

Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c
2017-07-08 07:14:59 +00:00
Treehugger Robot
839cc0433f Merge "Add more logging to the Tethering SharedLog" 2017-07-08 07:06:09 +00:00
Kouji Shiotani
1249e0a1b0 Merge "Fix wrong array index bound in NotificationUsageStats"
am: 87e893a449

Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46
2017-07-07 21:28:43 +00:00
Treehugger Robot
87e893a449 Merge "Fix wrong array index bound in NotificationUsageStats" 2017-07-07 21:20:40 +00:00
Neil Fuller
3e8c595d4a Fix dumpsys output for staged install version
Fix dumpsys output for staged install version:
there was a double prefix.

Bug: 31008728
Test: Manual
Change-Id: Idcbdee68cb9961d93df6de96d7a1617f70b7ac94
2017-07-07 16:09:49 +01:00
Android Build Merger (Role)
9dcf614397 Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master 2017-07-07 07:38:38 +00:00
Adam Vartanian
5cc7dddf1f Merge "Streamline testInstall_compatibleContext()"
am: 476d58c6bd

Change-Id: Ib9c11cb5d7cf80f6dc8695d3b3c28f82854f3617
2017-07-07 07:37:18 +00:00
Adam Vartanian
2886890793 Merge "Streamline testInstall_compatibleContext()"
am: 476d58c6bd

Change-Id: I99631c3166ced487e990f28f0e7c10c180d6473a
2017-07-07 07:36:34 +00:00
Erik Kline
b4df3f4574 Add more logging to the Tethering SharedLog
This may at first seem a tad spammy, but a cursory examination suggests
most of this is the Tethering subsystem doing more work than necessary.
Some of this can be addressed with some simple changes in the near term.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - watch "adb shell dumpsys connectivity tethering | tail 60"
      shows new log entries

Bug: 29337859
Bug: 32163131
Bug: 63334101

Change-Id: I9539a37f346469f0474084f5f31527bc35093bce
Merged-In: I6820e6cc81cfa43d99ad66860e1dcf42d20109f8
Merged-In: I10960bf23a837eda1fb473826596c484484f1875
Merged-In: I0a8eb8be5562fa814109191b0110050ca4b60c02
Merged-In: I6219e56d571854a2c61e1da63095e319e4bd3dc1
2017-07-07 16:30:08 +09:00
Adam Vartanian
476d58c6bd Merge "Streamline testInstall_compatibleContext()" 2017-07-07 07:27:29 +00:00