Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
387,192 Commits 3 Branches 0 Tags
38c550390be93ea46d329df4386ea9c51220cbbe
Commit Graph

387192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Hsieh
38c550390b Support generating fs-verity descriptor 
Note that since fsverity.h is not yet in bionic, most of them JNI code
is not compiled since HAS_FSVERITY is 0 by default.  The plan is to
remove it once the file is in.

Test: Manually copy linux/fsverity.h to bionic/libc/kernel/uapi, build
      with ENABLE_FSVERITY={0,1}.
Test: atest PtsApkVerityTestCases
Test: With other changes, observe the hash matches what other tool
      generates.
Bug: 112037636

Change-Id: I5e0ef0625a88326203ddfb3cbb73e12f2111b4b8
 2018-09-27 12:34:53 -07:00
Lalit Maganti
9e4a42e732 resolve merge conflicts of 81dfe744d6 to master 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I0b5ec6b1ccff17301711896e4481893dd9cf56c3
 2018-09-27 17:35:35 +01:00
TreeHugger Robot
361a1268f2 Merge "Fixes NPE on user changing back to Owner" 2018-09-27 16:11:31 +00:00
TreeHugger Robot
02dd9e2556 Merge "Add pre and post callbacks to ActivityLifecycleCallbacks" 2018-09-27 16:09:00 +00:00
Lalit Maganti
81dfe744d6 resolve merge conflicts of 0cb277ef87 to pi-dev-plus-aosp 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd
 2018-09-27 16:43:27 +01:00
TreeHugger Robot
9d189d5f56 Merge "Reset wifi tethering state when failing in QS." 2018-09-27 15:41:01 +00:00
Lalit Maganti
0cb277ef87 resolve merge conflicts of ee5fc8831e to stage-aosp-master 
Change-Id: Ibb00c2eb1e27914b361398c064715169d38a01fd
 2018-09-27 16:28:57 +01:00
TreeHugger Robot
1d65ea4edd Merge "Use the background thread instead ActivityManager to update CPU stats." 2018-09-27 14:59:27 +00:00
Jean-Michel Trivi
ee5fc8831e Merge "Make pre-scale for absolute volume configurable" 2018-09-27 14:35:13 +00:00
Makoto Onuki
8426a06516 Merge "Add API surface for "keep SMS app running"." 2018-09-27 14:30:41 +00:00
Fabian Kozynski
ae46022f11 Fixes NPE on user changing back to Owner 
Change-Id: I776dc713f2616ee0e57a0d8be1b7aab50d3fc453
Fixes: 116298366
Test: Manual and runtest
 2018-09-27 10:27:43 -04:00
Michael Wright
939b298ebc Merge "Add OWNERS for remotedisplay lib" 2018-09-27 14:26:04 +00:00
Android Build Merger (Role)
714b69c1dc Merge "[automerger skipped] Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 am: 164774b7bb am: 81462faf05 -s ours" 2018-09-27 14:08:40 +00:00
Lalit Maganti
276f0d5c05 [automerger skipped] Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 am: 164774b7bb 
am: 81462faf05  -s ours

Change-Id: I99c9bff1cd5f6c5975a6a31ef4c89ba10ae3a1a2
 2018-09-27 07:07:34 -07:00
Brad Stenning
48cfb7d0e9 Merge changes from topics "dialog_fix", "default_car_theme" 
* changes:
  Fix up the device colors that were missed
  Push color and default attributes up to the platform level
 2018-09-27 14:03:20 +00:00
Lalit Maganti
81462faf05 Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 
am: 164774b7bb

Change-Id: I6f825cf29b11a6b212e5beb163fed01f063befc0
 2018-09-27 06:52:40 -07:00
Olivier Gaillard
c2d02b522c Use the background thread instead ActivityManager to update CPU stats. 
Updating the CPU stats can be quite slow and blocks the ActivityManager
handler thread.

Bug: 115506775
Change-Id: I9f67acfe2724c11d117703b2c4ccdbcc1f61c5ab
Test: manual - dumpsys batterystats | grep CPU
 2018-09-27 13:42:48 +00:00
Lalit Maganti
164774b7bb Merge "Revert "new System API for preferred network mode"" 
am: 4106e419b2

Change-Id: Ifa5956f28ae3581e96f4e9be81cde5c54ddeeedd
 2018-09-27 06:34:08 -07:00
Bram Bonné
ab4bbc038e Merge "Moves all backup chunk-model related classes over to the framework." 2018-09-27 12:19:58 +00:00
Lalit Maganti
4106e419b2 Merge "Revert "new System API for preferred network mode"" 2018-09-27 12:17:40 +00:00
Lalit Maganti
dada4c60d8 Revert "new System API for preferred network mode" 
This reverts commit 8a8832fd81.

Reason for revert: Causing failures on git_pi-dev-plus-aosp for docs and aosp_sailfish.

Change-Id: I1801188e66420a67244b3223e26334c4650d56be
Merged-In: Ic108c484905f80783982a22e8152609257d684b5
 2018-09-27 10:52:55 +00:00
TreeHugger Robot
e672d07359 Merge "Fix unable to resume show-when-lock activity" 2018-09-27 06:48:10 +00:00
Calin Juravle
b77cdc0aef [automerger skipped] Merge "Fix trial run in AppLaunch test" am: 3e83b4cad8 am: fdbf99782e 
am: ade4132e1c  -s ours

Change-Id: I0d224f14966d51816ebe800947eae73f6407a807
 2018-09-26 21:49:55 -07:00
Calin Juravle
ade4132e1c Merge "Fix trial run in AppLaunch test" am: 3e83b4cad8 
am: fdbf99782e

Change-Id: I8f5fc7afb3c514ab862a3a99d3f93e77f65d698a
 2018-09-26 21:34:41 -07:00
Calin Juravle
fdbf99782e Merge "Fix trial run in AppLaunch test" 
am: 3e83b4cad8

Change-Id: Ia7d8b3d41614dc09c68e4fdae05934c5f1f9e4c7
 2018-09-26 21:19:11 -07:00
Ming-Shin Lu
429e1477da Merge "Remove SET_FORCE_HIDING_CHANGED related logics." 2018-09-27 03:56:59 +00:00
Treehugger Robot
3e83b4cad8 Merge "Fix trial run in AppLaunch test" 2018-09-27 02:20:30 +00:00
Jeff Sharkey
78478b130a Merge "We still need userIds to be populated." 2018-09-27 02:16:11 +00:00
Jeff Sharkey
9144b4dd85 We still need userIds to be populated. 
Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2105d974a5a77f3a38b887c8459d893639fdffa2
 2018-09-26 20:15:23 -06:00
Jeff Sharkey
7a0a11767e Merge "We still need userIds to be populated." 2018-09-27 02:14:35 +00:00
Jeff Sharkey
66768ba664 We still need userIds to be populated. 
Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2c2e3976ec7ec2b03ebee052ca8ce11b8f66495d
 2018-09-26 20:13:29 -06:00
TreeHugger Robot
f5d728745d Merge "Call Scene's exit action when use TransitionManager.go() with null transition" 2018-09-27 02:04:32 +00:00
TreeHugger Robot
f20506f4a2 Merge "Use androidx shadow for Fragment testing." 2018-09-27 01:51:26 +00:00
Chen Xu
238c5b95e5 [automerger skipped] Merge "new System API for preferred network mode" am: 314dcd2874 am: 4560dbd05a 
am: d2bd668324  -s ours

Change-Id: I14536beb5928bd6abb4ddc6a8e0f90b3710a692f
 2018-09-26 18:09:57 -07:00
Chen Xu
d2bd668324 Merge "new System API for preferred network mode" am: 314dcd2874 
am: 4560dbd05a

Change-Id: I43b606e03b9c3276ba7996a5f7feede5d31c0b01
 2018-09-26 17:58:00 -07:00
Wei Sheng Shih
d4c9ab94ee Merge "Fix activity cannot goes to stop when keyguard shown." 2018-09-27 00:45:30 +00:00
TreeHugger Robot
181073bbea Merge "Fix trial run in AppLaunch test" 2018-09-27 00:43:20 +00:00
Chen Xu
4560dbd05a Merge "new System API for preferred network mode" 
am: 314dcd2874

Change-Id: Ic1c8588f2d6d200adba6dcb10c2f991eeff630de
 2018-09-26 17:42:58 -07:00
TreeHugger Robot
4bb9a2e54b Merge "Add missing TextView attributes to JavaDoc" 2018-09-27 00:36:30 +00:00
Jordan Liu
79b6413f2c Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af am: 737945fbd5 
am: 023c48e92b

Change-Id: I56bb5b63464eadce740708f03b8ca0b49f9be133
 2018-09-26 17:32:24 -07:00
Chen Xu
314dcd2874 Merge "new System API for preferred network mode" 2018-09-27 00:30:29 +00:00
Jordan Liu
023c48e92b Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af 
am: 737945fbd5

Change-Id: I38e3374723e4e756688eb3572cffc59834924625
 2018-09-26 17:22:24 -07:00
Fan Zhang
0938906059 Use androidx shadow for Fragment testing. 
Bug: 111195449
Test: robotests
Change-Id: I54b6e8dd4fa0e3affbb972a75b9357186b3af700
 2018-09-26 17:15:47 -07:00
Jordan Liu
737945fbd5 Merge "Dismiss SIM lock page after correct SIM" 
am: eb1d6d91af

Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b
 2018-09-26 17:09:44 -07:00
TreeHugger Robot
3cefe0e2b1 Merge "Gets the contextual drawable correctly when rotating device" 2018-09-26 23:58:09 +00:00
Tomoharu Kasahara
85b8c1fcf0 Make pre-scale for absolute volume configurable 
Audio gain for lower volume steps are restricted for
Bluetooth Absolute Volume scenario, but it's better
not to use the fixed value.
This CL makes it possible to configure the value of
pre-scale.

Bug: 114220617
Test: manual - gain is restricted as per the configuration

Change-Id: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
Merged-In: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
 2018-09-27 08:50:07 +09:00
Jordan Liu
eb1d6d91af Merge "Dismiss SIM lock page after correct SIM" 2018-09-26 23:42:55 +00:00
Andrey Kulikov
0a6085e87a Call Scene's exit action when use TransitionManager.go() with null transition 
Bug: 65536124

When we pass null for TransitionManager.go() there is a special logic where we forgot to call previousScene.exit(), only newscene.enter() is called.

Test: added unit tests and tested manually
Change-Id: Ibd4d5a2cc17bbfe4aaa586357446da28d4b355af
 2018-09-27 00:42:49 +01:00
Wale Ogunwale
39a6834c6e Merge "Introducing PendingIntentController (17/n)" 2018-09-26 23:15:29 +00:00
Ryan Mitchell
63c6be63a4 Merge "Change FileStream test buffer from char* void*" am: b839befd7b am: 47be78e523 
am: 5d63c53071

Change-Id: I79fed846a0d7bd20be13a5d3845bfe1a171f5b62
 2018-09-26 15:46:37 -07:00