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

314543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
d1a6e6740f Merge "AAPT2: Generate R.txt" into oc-dev 2017-04-13 06:54: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
Bill Yi
f54f0ea174 Import translations. DO NOT MERGE 
Change-Id: I3bf092ebb3c99f4708f20d2d303e201c1da1ae9a
Auto-generated-cl: translation import
 2017-04-12 23:53:10 -07:00
TreeHugger Robot
07d60cce02 Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev 2017-04-13 06:48:29 +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
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev 
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
 2017-04-13 06:23:51 +00:00
Erik Kline
23c0170352 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca 
am: 1d3528ba86

Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
 2017-04-13 06:18:38 +00:00
Erik Kline
1d3528ba86 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c 
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
 2017-04-13 06:12:30 +00:00
Erik Kline
1303b8b9ca Merge "Ignore potential SystemProperties errors when setting net.dns" 
am: f854c9034c

Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
 2017-04-13 06:00:37 +00:00
Treehugger Robot
f854c9034c Merge "Ignore potential SystemProperties errors when setting net.dns" 2017-04-13 05:49:31 +00:00
Lorenzo Colitti
42f7ca684c Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 
am: 997e6b085a

Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
 2017-04-13 05:48:37 +00:00
Bill Yi
3b1e4d3e86 Import translations. DO NOT MERGE 
Change-Id: I4d7599fdee360cf86ce1980b9759a692a493d21b
Auto-generated-cl: translation import
 2017-04-12 22:38:20 -07:00
Lorenzo Colitti
997e6b085a Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b 
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
 2017-04-13 05:37:01 +00:00
Winson Chung
3f103eb430 Fix issue with non-focusable PiP activities being resumed. 
- When the change to finish activities was made in ag/2067154, it exposed
  an issue in pinned stacks where we would resume the next top activity
  once the top activity finished pausing. Normally, the pinned stack is
  not focusable, but since it has an alwaysFocusable menu activity it
  becomes the focused stack and falls into this case.

  Instead of finding the next top activity, we need to find the next top
  focusable activity to resume, and fall through to focusing the top
  activity in the next focusable stack if there is none.

Bug: 37199067
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testNoResumeAfterTaskOverlayFinishes
Change-Id: Ib79826ff38bb3beb38a40183ddc6819e5040bb27
 2017-04-12 22:31:12 -07:00
Lorenzo Colitti
67401e25c2 Merge "Move some NetworkStats tests to tests/net." 
am: ab3901dc8b

Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
 2017-04-13 05:29:58 +00:00
Lorenzo Colitti
ab3901dc8b Merge "Move some NetworkStats tests to tests/net." 2017-04-13 05:18:47 +00:00
Daichi Hirono
1737e10334 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 
am: 96907e6553

Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
 2017-04-13 04:42:22 +00:00
Robert Carr
af422a8c5b Stack APPLICATION_MEDIA_OVERLAY windows with relative layering. 
See accompanying frameworks/native commit
 "SurfaceFlinger: Add parent-less relative layering" for a full explanation.

Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug: 36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
 2017-04-12 21:40:30 -07:00
TreeHugger Robot
96907e6553 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 2017-04-13 04:36:50 +00:00
Bill Yi
7dc403b158 Import translations. DO NOT MERGE 
Change-Id: I140e40e34c4ee3482c87f180d292bdba8594961b
Auto-generated-cl: translation import
 2017-04-12 21:31:16 -07:00
Erik Kline
4edba01eb4 Ignore potential SystemProperties errors when setting net.dns 
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
 2017-04-13 13:16:22 +09:00
Fyodor Kupolov
9f3cf1a692 Merge "Report app data fixup and prepare timings" into oc-dev 
am: 1423ea3a45

Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
 2017-04-13 04:13:44 +00:00
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Vladislav Kaznacheev
2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 
am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc
 2017-04-13 03:47:25 +00:00
Daichi Hirono
e200ae8157 Address API review for ProxyFileDescriptorCallback 
The CL revise the documentation for ProxyFileDescriptorCallback.

 * Added explanation to onFsync.
 * Added explanation about offset.
 * Mentioned ErrnoException should contain E constants in OsConstants.

Bug: 35813046
Test: Build succeed
Change-Id: Ied2490b1913445ea8240eb3aaf7c12170ae4e42d
(cherry picked from commit 9555e30288fe984dcb788c496e7582c14faa66da)
 2017-04-13 03:40:08 +00:00
TreeHugger Robot
0964a2d9fc Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 2017-04-13 03:36:30 +00:00
Jocelyn Dang
ae624f3f0b Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 
am: 78b3b2308c

Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
 2017-04-13 02:58:37 +00:00
Jocelyn Dang
78b3b2308c Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 2017-04-13 02:50:52 +00:00