Seigo Nonaka
193743ad1c
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev am: 061db23b79
...
am: c0c5763793
Change-Id: Ibe1167effdbe6ae39f10793691e2722900cd7af7
2017-04-13 13:33:28 +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
TreeHugger Robot
061db23b79
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
2017-04-13 13:22:10 +00:00
Tony Mak
0d801659d9
Merge "Add hidden API startActivityForResultAsUser" into oc-dev am: bb14fb9acb
...
am: 76979ccddc
Change-Id: I1f8f2a01bfa5bf8f1995efb85df89098a2ec21ea
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
Hugo Benichi
fd0b79fb4e
Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261 am: b98eee1f78
...
am: 54e288cc6d
Change-Id: I80446a6c334661fb87e1dabc0765e50e39443612
2017-04-13 10:16:23 +00: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
896a43c4a3
Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 am: 85f5725fb5 am: 270ab2fa7e
...
am: 152c9cf703
Change-Id: I8fa851793f50a4b4d8cd003790febeb3f2902d06
2017-04-13 08:50:05 +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
Robert Carr
f6347e104b
Merge "ViewRoot: More surgically fix child-life time." into oc-dev am: 22762b2283
...
am: 92d7df7455
Change-Id: I1d57123db0dd800ea587f3a709742122089ffed2
2017-04-13 08:42:17 +00:00
Narayan Kamath
aee1f41f0c
Merge "Binder: Be forceful about a forceful exit." into oc-dev am: 6780828985
...
am: 6dd8b1f411
Change-Id: I17b285919cb5feaf9ba3c82c374146733335894a
2017-04-13 08:41:19 +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
53042fc5b2
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev am: d280bfea23
...
am: 6c8c498b5b
Change-Id: I2da5392ab850cdf9053cfd16d216feffe9afada5
2017-04-13 08:03:37 +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
4684ba6c9e
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev am: 9d5ac93cc3
...
am: b3871981f2
Change-Id: I2b413c9ba1d36fc8f8b3dffedf72331de82a4b40
2017-04-13 07:34:22 +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
15715786ff
Merge "Minor text fixes." into oc-dev am: 818c408e5d
...
am: ba7435fd81
Change-Id: Id5bac5e8654e55d03835bdf5dc660d5985d67cbc
2017-04-13 07:10:34 +00:00
Android Build Merger (Role)
380163d475
Merge "Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f am: cb276fa531"
2017-04-13 07:07:58 +00:00
Adam Lesinski
d68c11b573
Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f
...
am: cb276fa531
Change-Id: I199b76e76a9ed5d4e79ec54830060779eb27c548
2017-04-13 07:07:15 +00:00
Android Build Merger (Role)
7eac72a86a
Merge "Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02 am: 49f1db32ef"
2017-04-13 07:06:55 +00:00
Michael Wright
8f072af76d
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02
...
am: 49f1db32ef
Change-Id: If9510872fe549d06a4f2cdef6c96862f5dfd4127
2017-04-13 07:06:11 +00:00
Android Build Merger (Role)
72a45681d7
Merge "Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am: 4ad2ebcc90 am: 3395e15204"
2017-04-13 07:05:48 +00:00
TreeHugger Robot
36fd86fa09
Merge "expose visibility of PbapClientProfile. The use case is that the Car head unit will be consuming the data instead of providing it"
2017-04-13 07:05:30 +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
Adam Lesinski
a23489806a
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am: 4ad2ebcc90
...
am: 3395e15204
Change-Id: I983cee532196a5cd9a16fb65a2007a155428256c
2017-04-13 07:04:57 +00:00
TreeHugger Robot
818c408e5d
Merge "Minor text fixes." into oc-dev
2017-04-13 07:00:57 +00:00
Adam Lesinski
cb276fa531
Merge "AAPT2: Generate R.txt" into oc-dev
...
am: d1a6e6740f
Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
2017-04-13 06:59:33 +00:00
Michael Wright
49f1db32ef
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
...
am: 07d60cce02
Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
2017-04-13 06:55:21 +00:00
Adam Lesinski
3395e15204
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
...
am: 4ad2ebcc90
Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
2017-04-13 06:54:21 +00:00
TreeHugger Robot
d1a6e6740f
Merge "AAPT2: Generate R.txt" into oc-dev
2017-04-13 06:54:21 +00:00
TreeHugger Robot
07d60cce02
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
2017-04-13 06:48:29 +00:00
Chong Zhang
5ad4b40999
Merge changes from topic 'api-review' into oc-dev am: fd89a95f35
...
am: 847beba350
Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948
MediaCas: address comments for API reviews am: addc39ec27
...
am: e0c465fefa
Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
2017-04-13 06:43:36 +00:00
TreeHugger Robot
4ad2ebcc90
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
2017-04-13 06:42:52 +00:00
Chong Zhang
847beba350
Merge changes from topic 'api-review' into oc-dev
...
am: fd89a95f35
Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
2017-04-13 06:34:25 +00:00
Chong Zhang
e0c465fefa
MediaCas: address comments for API reviews
...
am: addc39ec27
Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
2017-04-13 06:32:28 +00:00
