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

332694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
6c1cb7f090 Merge "Repackage com.android.internal.util.Predicate" 2017-07-14 13:58:40 +00:00
Julia Reynolds
1cd8e1e3bf Merge "Fix system crash" into oc-dr1-dev am: 5a0958ed0b 
am: e58e833819

Change-Id: I601238f6ced41633f5674d68a741fbdaeb3bb4a0
 2017-07-14 13:55:30 +00:00
TreeHugger Robot
4957cfe2ea Merge "Pull backup password logic out of BackupManagerService" 2017-07-14 13:52:15 +00:00
Robert Berry
9699fe319e Pull backup password logic out of BackupManagerService 
This makes it easier to follow what's going on. Also makes it easy for us to
add unit tests for this component.

Bug: 36850431
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ifb85f1573bcfb7da26febed35d49454614b5d975
 2017-07-14 14:51:16 +01:00
Julia Reynolds
e58e833819 Merge "Fix system crash" into oc-dr1-dev 
am: 5a0958ed0b

Change-Id: Icd087a48c50670bc5a59c34a13ecb3df5d5529e2
 2017-07-14 13:49:13 +00:00
Jason Monk
3b9357f3b9 Take a wrench to the pipes 
- Track extensions in garbage tracking because they could be big
 - Fix volume dialog cleanup to not leak
 - Fix QSFragment cleanup to not leak
 - Make DockedStackExistsListener static because it is going to leak
   because /Binder/
 - Add a secure setting to force on notifications for garbage monitoring
   for those that really really want it.

Test: adb shell dumpsys activity service SystemUI | grep -A 12 LEAK
Change-Id: Id5689febd65eb8a22dbb4a0a15ec051fcdbbf8be
Fixes: 38461559
 2017-07-14 09:47:58 -04:00
Robert Berry
c31a839fd3 Move logic for backup journal into its own class 
Refactor to further simplify BackupManagerService, which currently has too
many responsibilities. Also adds unit tests.

Bug: 36850431
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Id433d7604c22c8b6f0d524a9bf9e83053facc0ca
 2017-07-14 14:45:22 +01:00
TreeHugger Robot
267c6b2a5b Merge "Avoid FloatingToolbar flickers" 2017-07-14 13:44:45 +00:00
TreeHugger Robot
5a0958ed0b Merge "Fix system crash" into oc-dr1-dev 2017-07-14 13:40:44 +00:00
Adrian Roos
3a8f892bd8 AOD: Refactor low and high brightness modes 
Bug: 63427319
Test: Receive notification on AOD, observe that brightness does not change.
Change-Id: I6ab6d75121f51ac16c08e59a3e552808a8e70853
 2017-07-14 13:02:16 +00:00
Adrian Roos
7f91072c43 AOD: Show date on always-on display 
Test: Turn off display. Make sure date shows on AOD. Also make sure it works with a white wallpaper.
Fixes: 63528250
Change-Id: I82e0e579f351c5f145021d0b3759f79c11a1270e
 2017-07-14 12:17:39 +00:00
Narayan Kamath
516e4d3c2b Merge "DisplayPowerController: Disable color fade on low-ram devices." 2017-07-14 11:03:52 +00:00
Hugo Benichi
bc67fd74c0 Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp 
am: 44d0cda8ef

Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160
 2017-07-14 09:59:31 +00:00
TreeHugger Robot
44d0cda8ef Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp 2017-07-14 09:50:59 +00:00
TreeHugger Robot
8b46acba25 Merge "Connectivity metrics: update ipconnectivity.proto" 2017-07-14 09:15:52 +00:00
Eino-Ville Talvala
b57501a8d9 Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c 
am: 01d6fb2c9c

Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30
 2017-07-14 05:55:35 +00:00
Hugo Benichi
12df465997 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 oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)

Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
 2017-07-14 14:54:58 +09:00
Eino-Ville Talvala
01d6fb2c9c Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev 
am: 0c0fd0375c

Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2
 2017-07-14 05:49:45 +00:00
TreeHugger Robot
0c0fd0375c Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev 2017-07-14 05:41:34 +00:00
Hugo Benichi
6d2f506bfd Connectivity metrics: update ipconnectivity.proto 
Bug: 34901696
Test: $runtest frameworks-net
      build, flashed, booted phone, $ adb shell dumpsys connmetrics list

Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9
 2017-07-14 13:39:24 +09:00
Naveen Kalla
2359ddb039 resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp 
am: 7e15c58085  -s ours

Change-Id: I8beaabea919d72b47137234926b1d82507798109
 2017-07-14 04:03:10 +00:00
Naveen Kalla
7e15c58085 resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp 
Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
 2017-07-13 20:49:08 -07:00
Android Build Merger (Role)
6fee87a865 Merge "Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9 am: f83fb827a7 am: 7b8d8578de" 2017-07-14 03:02:47 +00:00
TreeHugger Robot
4303e01675 Merge "dump visiblity table in dumpsys accounts" 2017-07-14 03:01:36 +00:00
Hall Liu
4622acb950 Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9 am: f83fb827a7 
am: 7b8d8578de

Change-Id: Iea8b54a10778494a0aee969ebf70fdc4e5e86cf7
 2017-07-14 03:01:09 +00:00
TreeHugger Robot
b78661052c Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" into oc-dr1-dev 2017-07-14 02:54:59 +00:00
Hall Liu
7b8d8578de Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9 
am: f83fb827a7

Change-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2
 2017-07-14 02:54:29 +00:00
Hall Liu
f83fb827a7 Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe 
am: d98024a1f9

Change-Id: I917a65a35bc607cdc9b820ac55a98d6bfab1b782
 2017-07-14 02:48:17 +00:00
Hall Liu
d98024a1f9 Merge "Clean up streaming API docs and organize errors" 
am: d2c8dcfcfe

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
 2017-07-14 02:43:10 +00:00
Treehugger Robot
d2c8dcfcfe Merge "Clean up streaming API docs and organize errors" 2017-07-14 02:32:21 +00:00
TreeHugger Robot
d7fad0e1ce Merge "Log sorted order instead of original order of selected apps." 2017-07-14 02:29:26 +00:00
Roozbeh Pournader
e2393ae726 Merge "Make strike-through respect kerning at boundaries" 2017-07-14 02:17:43 +00:00
Roozbeh Pournader
4d4596aae8 Fix calculation of RelativeLayout width in RTL mode 
Fixes: 37035671
Test: Manual
Test: bit CtsWidgetTestCases:.RelativeLayoutTest
Change-Id: I82feecdba7d1ed1198580758ab1f68932bb50aa7
 2017-07-13 19:11:05 -07:00
TreeHugger Robot
294e7ea9be Merge "Import translations. DO NOT MERGE" 2017-07-14 01:50:16 +00:00
TreeHugger Robot
1f2b5ff912 Merge "Import translations. DO NOT MERGE" 2017-07-14 01:33:05 +00:00
yangren
f0cb6061ea Reduce the image size of media route button 
Change-Id: I54b493e2277d328fd818b1e5c351ed993779b3ae
 2017-07-13 18:16:26 -07:00
Lorenzo Colitti
f7a008ff69 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6 
am: 041111ff7e

Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f
 2017-07-14 01:06:56 +00:00
Lorenzo Colitti
041111ff7e Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev 
am: 3756636ad6

Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
 2017-07-14 01:01:29 +00:00
Android Build Merger (Role)
0ce5953534 Merge "Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8cd" into oc-dr1-dev-plus-aosp am: d792c31806" 2017-07-14 00:59:05 +00:00
TreeHugger Robot
31b8eece03 Merge "Import translations. DO NOT MERGE" 2017-07-14 00:58:21 +00:00
Roozbeh Pournader
bfe8b1cdd6 Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8cd" into oc-dr1-dev-plus-aosp 
am: d792c31806

Change-Id: I91e28ff9aa7b2bea64dcfe2371f8a734ea8cbb6e
 2017-07-14 00:57:59 +00:00
Hugo Benichi
0e525ba7d8 resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master am: a428392c1d am: 164ff8a2ed 
am: a30cb89dfa  -s ours

Change-Id: Ie43a31dc8ccc156383c8ab24a255e0683a44622a
 2017-07-14 00:55:52 +00:00
Lorenzo Colitti
3756636ad6 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev 
* changes:
  Add code to dump OffloadController state.
  Fetch tethering offload stats.
  Allow more than one source of tethering statistics.
 2017-07-14 00:51:56 +00:00
Kang Li
78c6efcdf3 Log sorted order instead of original order of selected apps. 
Test: tested it with Tron logs to verify it works as expected.

Change-Id: I7b93fc57c1b72efbcb4f0dee429d7b22b47b6b0b
 2017-07-13 17:50:55 -07:00
Android Build Merger (Role)
d792c31806 Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8cd" into oc-dr1-dev-plus-aosp 2017-07-14 00:48:52 +00:00
Roozbeh Pournader
6cb5c27fa0 Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev 
am: dd74c1a8cd

Change-Id: I23c2927e8281cb00f4d0fef8c83bcdebb2f682c7
 2017-07-14 00:47:51 +00:00
Hugo Benichi
a30cb89dfa resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master am: a428392c1d 
am: 164ff8a2ed

Change-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47
 2017-07-14 00:46:49 +00:00
TreeHugger Robot
f9bdedf9f4 Merge "Import translations. DO NOT MERGE" 2017-07-14 00:43:53 +00:00
TreeHugger Robot
06e999e985 Merge "Import translations. DO NOT MERGE" 2017-07-14 00:40:08 +00:00
Hugo Benichi
164ff8a2ed resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master 
am: a428392c1d

Change-Id: Ide67520d074330ec050ded71118bff0bc88be784
 2017-07-14 00:37:20 +00:00