drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
314,457 Commits 1 Branch 0 Tags
Commit Graph

314457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2d8e49dace Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 05c71b3bbe  -s ours

Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93
 2017-04-13 16:12:29 +00:00
Bill Yi
ca2721f9bd Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 2f522fc904  -s ours

Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4
 2017-04-13 15:55:30 +00:00
TreeHugger Robot
05c71b3bbe Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:55:03 +00:00
TreeHugger Robot
2f522fc904 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:42:31 +00:00
Bill Yi
466cbb6daa Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 023c36f89f  -s ours

Change-Id: I4c1239ade7c3d827cbf6f209ef0375ab5420a9e1
 2017-04-13 15:39:27 +00:00
Bill Yi
d232463193 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 9e8fa5ec61  -s ours

Change-Id: I0bb86e97bf9e1dbe7aa0de9ba4bde9e72bce7440
 2017-04-13 15:38:21 +00:00
Hugo Benichi
a295bdce7f Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
am: 7270534ac4  -s ours

Change-Id: I98536197e3c4096badcc197ffac7b72836ac00dd
 2017-04-13 15:37:10 +00:00
TreeHugger Robot
023c36f89f Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:27:27 +00:00
TreeHugger Robot
9e8fa5ec61 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:26:29 +00:00
TreeHugger Robot
7270534ac4 Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
* changes:
  Captive portal: fix probe urls at network creation
  NetworkMonitor: improve captive portal validation logs
 2017-04-13 15:26:05 +00:00
Julia Reynolds
1a6ac41f72 Only foreground notis should be sorted higher 
am: 889280c4c3

Change-Id: I755fc0766540a8e836fcd98901c87e4d1ee335c1
 2017-04-13 15:19:09 +00:00
Julia Reynolds
889280c4c3 Only foreground notis should be sorted higher 
Having the ongoing flag is not enough.

Test: runtest systemui-notification
Change-Id: I8a6c15af819f2bb4ad3937ae45d33361663fbe13
 2017-04-13 11:03:57 -04:00
Niels Egberts
937f46ffd1 Merge "Document examples where a developer might use the APIs." into oc-dev 
am: 3a543a1bd2

Change-Id: I2c9e5961381e8b7dc1e46b96c704a52ec430e80e
 2017-04-13 14:54:59 +00:00
Dianne Hackborn
80cc3154ee Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 
am: 809f4cf121

Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
 2017-04-13 14:42:33 +00:00
TreeHugger Robot
3a543a1bd2 Merge "Document examples where a developer might use the APIs." into oc-dev 2017-04-13 14:41:59 +00:00
TreeHugger Robot
809f4cf121 Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 2017-04-13 14:32:41 +00:00
Hugo Benichi
e90070d528 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a 
am: 4d47a6a26b

Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
 2017-04-13 13:52:21 +00:00
Orion Hodson
c05219d7b3 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11 
am: 2d5f14e578

Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
 2017-04-13 13:46:57 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
 2017-04-13 13:46:32 +00:00
Orion Hodson
2d5f14e578 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 
am: 0f7294af11

Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
 2017-04-13 13:40:32 +00:00
Hugo Benichi
4d47eba86a Merge "Revert "Captive portal: rotate fallback urls"" 
am: 9ea45b6106

Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
 2017-04-13 13:40:04 +00:00
Orion Hodson
0f7294af11 Merge "Unhide MethodHandles.explicitCastArguments()" 
am: 891cab55d3

Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
 2017-04-13 13:34:27 +00:00
Seigo Nonaka
c0c5763793 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 
am: 061db23b79

Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
 2017-04-13 13:27:57 +00:00
Hugo Benichi
9ea45b6106 Merge "Revert "Captive portal: rotate fallback urls"" 2017-04-13 13:25:42 +00:00
Treehugger Robot
891cab55d3 Merge "Unhide MethodHandles.explicitCastArguments()" 2017-04-13 13:25:12 +00:00
TreeHugger Robot
061db23b79 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 2017-04-13 13:22:10 +00:00
Niels Egberts
04637f3d4d Document examples where a developer might use the APIs. 
Test: mmma frameworks/base/
Bug: 35767714

Change-Id: I845db36869b84a18e79d7fe28f10031cfe836617
 2017-04-13 13:52:07 +01:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls" 
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
 2017-04-13 12:43:49 +00:00
Tony Mak
76979ccddc Merge "Add hidden API startActivityForResultAsUser" into oc-dev 
am: bb14fb9acb

Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978
 2017-04-13 12:36:35 +00:00
TreeHugger Robot
bb14fb9acb Merge "Add hidden API startActivityForResultAsUser" into oc-dev 2017-04-13 12:13:03 +00:00
Bill Yi
ca0db87f3e Import translations. DO NOT MERGE 
Change-Id: Iaf188ae0fe780b83f7caa70e8221126d1ffed110
Auto-generated-cl: translation import
 2017-04-13 04:43:14 -07:00
Hugo Benichi
54e288cc6d Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261 
am: b98eee1f78

Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
 2017-04-13 10:10:27 +00:00
Hugo Benichi
b98eee1f78 Merge changes Ia15f77e2,Icaa1f95c am: c923752929 
am: 8e5ebd9261

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
 2017-04-13 09:40:19 +00:00
Hugo Benichi
8e5ebd9261 Merge changes Ia15f77e2,Icaa1f95c 
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
 2017-04-13 09:34:22 +00:00
Treehugger Robot
c923752929 Merge changes Ia15f77e2,Icaa1f95c 
* changes:
  Captive portal: regroup hardcoded http response codes.
  Captive portal: rotate fallback urls
 2017-04-13 09:24:33 +00:00
Erik Kline
152c9cf703 Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 am: 85f5725fb5 
am: 270ab2fa7e

Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
 2017-04-13 08:44:51 +00:00
Erik Kline
270ab2fa7e Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 
am: 85f5725fb5

Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
 2017-04-13 08:38:44 +00:00
Robert Carr
92d7df7455 Merge "ViewRoot: More surgically fix child-life time." into oc-dev 
am: 22762b2283

Change-Id: I5685e1d7b4747a5e0276158f11de355131fc4dea
 2017-04-13 08:34:19 +00:00
Erik Kline
85f5725fb5 Merge "Extract SimChangeListener to its own file" 
am: 0ef8df6d52

Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
 2017-04-13 08:33:12 +00:00
Narayan Kamath
6dd8b1f411 Merge "Binder: Be forceful about a forceful exit." into oc-dev 
am: 6780828985

Change-Id: I966efbe35b0fa0416a5057cb9a1df001baa4590d
 2017-04-13 08:28:13 +00:00
TreeHugger Robot
22762b2283 Merge "ViewRoot: More surgically fix child-life time." into oc-dev 2017-04-13 08:25:10 +00:00
Treehugger Robot
0ef8df6d52 Merge "Extract SimChangeListener to its own file" 2017-04-13 08:19:07 +00:00
Narayan Kamath
6780828985 Merge "Binder: Be forceful about a forceful exit." into oc-dev 2017-04-13 08:16:49 +00:00
Tadashi G. Takaoka
6c8c498b5b Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 
am: d280bfea23

Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
 2017-04-13 07:53:39 +00:00
Hugo Benichi
a415870221 Captive portal: regroup hardcoded http response codes. 
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.

This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.

Test: built, flashed, tested manually with various portal networks
Bug: 36532213

Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
 2017-04-13 16:45:47 +09:00
Hugo Benichi
0908daaaf0 Captive portal: rotate fallback urls 
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
 2017-04-13 16:45:44 +09:00
Tadashi G. Takaoka
d280bfea23 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 2017-04-13 07:41:34 +00:00
Robert Carr
b3871981f2 Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev 
am: 9d5ac93cc3

Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
 2017-04-13 07:22:01 +00:00
TreeHugger Robot
9d5ac93cc3 Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev 2017-04-13 07:12:55 +00:00
Dan Sandler
ba7435fd81 Merge "Minor text fixes." into oc-dev 
am: 818c408e5d

Change-Id: I344ae2f6456893defd49d9efe5af8325770bcf83
 2017-04-13 07:05:05 +00:00