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

415214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
1def0b7d7d Merge "Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436 am: f4efaf0c5a" into qt-dev 2019-04-17 18:15:13 +00:00
TreeHugger Robot
7269961ae3 Merge "Annotate Part Uri as @NonNull" into qt-dev 2019-04-17 18:10:39 +00:00
Brad Ebinger
af6f933993 Merge "Reorder ImsFeature initialization to handle STATE_READY" into qt-dev 2019-04-17 17:59:16 +00:00
Quang Luong
b3730b86d8 Merge "Added AccessPoint.matches(AccessPoint) method to match AP objects" into qt-dev 2019-04-17 17:57:39 +00:00
Christopher Ferris
29fd36a4a0 Merge "Remove gMallocLeakZygoteChild." into qt-dev 
am: dc6a988e5f

Change-Id: I5266295c6ba0db2e855c49c1c16f932f0346b989
 2019-04-17 10:42:21 -07:00
Christopher Ferris
31c0ceba9c Merge "Remove gMallocLeakZygoteChild." 2019-04-17 17:31:04 +00:00
Xiangyu/Malcolm Chen
8306a55b5b Merge "Add API to set alwaysAllowMms" into qt-dev 
am: f447240a0c

Change-Id: I7d243714fef121d6379db587c79edd15fa6fad92
 2019-04-17 10:30:50 -07:00
Christopher Ferris
dc6a988e5f Merge "Remove gMallocLeakZygoteChild." into qt-dev 2019-04-17 17:30:22 +00:00
Philip P. Moltmann
9c90c1307a Merge "Always request coarse location with fine location" into qt-dev 
am: b17b60c3b1

Change-Id: Idd2221c428b4b50d385ae92d41c3f81bddd4c97b
 2019-04-17 10:22:37 -07:00
Jeff Sharkey
42bf6d8a42 Adjust MTP to reference by specific volume name. 
The MediaStore.VOLUME_EXTERNAL volume is a merged view of all storage
devices, and clients working on a specific volume need to focus on
the volume they're interested in.

Bug: 129840030
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I91cee6a96d7f9360e6a93a9a3c389b097b6b9967
 2019-04-17 11:16:15 -06:00
Xiangyu/Malcolm Chen
f447240a0c Merge "Add API to set alwaysAllowMms" into qt-dev 2019-04-17 17:14:55 +00:00
Sandeep Patil
87bfbd600e Merge "storagemenager: Skip fstrim while doing block based checkpoint" into qt-dev 
am: 274b17c925

Change-Id: I16046484e9dd39b083a43e2414c04ffb81bafcc2
 2019-04-17 10:06:57 -07:00
Philip P. Moltmann
b17b60c3b1 Merge "Always request coarse location with fine location" into qt-dev 2019-04-17 16:55:41 +00:00
TreeHugger Robot
274b17c925 Merge "storagemenager: Skip fstrim while doing block based checkpoint" into qt-dev 2019-04-17 16:46:38 +00:00
Amith Yamasani
1cace9a127 Merge "Include oom_adjust reason in trace" into qt-dev 
am: 0ba84f8f24

Change-Id: Iadda6bf4ed89fe0e40fdcedcded0b57f8fd4a730
 2019-04-17 09:15:29 -07:00
Joshua Tsuji
f418f9e744 Reposition the stack to a similar position upon rotation. 
Fixes: 128691406
Test: atest SystemUITests
Change-Id: I2d73c88f06d759c2b7b71dc77d008a1e026ee959
 2019-04-17 12:04:38 -04:00
Richard Uhler
5a8c7573c9 Merge "Use USER_SYSTEM instead of USER_ALL when enabling rollback." into qt-dev 
am: 00202de30e

Change-Id: I7d2d103f0280b34793cffbf05fb8edaecfa2b71b
 2019-04-17 08:52:58 -07:00
Wei Wang
022cc29744 Merge "Thermal: send callback even if no HAL exist." into qt-dev 
am: 2deeadae72

Change-Id: I9de19ed8eecc92cca610c5d5ace138af9b9a6c70
 2019-04-17 08:46:39 -07:00
Amith Yamasani
0ba84f8f24 Merge "Include oom_adjust reason in trace" into qt-dev 2019-04-17 15:43:01 +00:00
TreeHugger Robot
00202de30e Merge "Use USER_SYSTEM instead of USER_ALL when enabling rollback." into qt-dev 2019-04-17 15:32:28 +00:00
Neil Fuller
1e1e148848 Merge "Fix incorrect leap year logic" am: ca13216bd1 
am: ef56b49dfd

Change-Id: I815ad6a124dc7e9cc7a9ac3e9163f849711b537c
 2019-04-17 08:28:11 -07:00
Wei Wang
2deeadae72 Merge "Thermal: send callback even if no HAL exist." into qt-dev 2019-04-17 15:25:02 +00:00
Ruslan Tkhakokhov
a92bb9fa57 Merge "BroadcastReceiver in UserBackupManagerService can crash system_server" into qt-dev 
am: 451e2d843d

Change-Id: Ia9bd1739203684ece631c53f6cdd1ab6d26e0f1c
 2019-04-17 08:18:09 -07:00
Neil Fuller
ef56b49dfd Merge "Fix incorrect leap year logic" 
am: ca13216bd1

Change-Id: Iebb67ebbd2e186f51ec6f08578e7c8dd1e10e528
 2019-04-17 08:16:38 -07:00
Ruslan Tkhakokhov
451e2d843d Merge "BroadcastReceiver in UserBackupManagerService can crash system_server" into qt-dev 2019-04-17 14:54:46 +00:00
Jean-Michel Trivi
9dcd2d0738 Merge "AudioService: fix audio mode lock" into qt-dev 
am: 469f1c90ed

Change-Id: I855cfaf0687b048bf674f1bd4589f006facf25fd
 2019-04-17 07:52:43 -07:00
Neil Fuller
ca13216bd1 Merge "Fix incorrect leap year logic" 2019-04-17 14:50:04 +00:00
Joel Galenson
c408693443 Merge "Make an atom visible to Permission Controller." into qt-dev 
am: 580a12333e

Change-Id: Icb1b7e8888ea8ecee8e807d79f949cc8263950da
 2019-04-17 07:42:07 -07:00
Wayne Ma
23752d475a Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: 59d332387c 
am: 1d6c748213

Change-Id: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9
 2019-04-17 07:26:59 -07:00
Jean-Michel Trivi
469f1c90ed Merge "AudioService: fix audio mode lock" into qt-dev 2019-04-17 14:26:44 +00:00
TreeHugger Robot
580a12333e Merge "Make an atom visible to Permission Controller." into qt-dev 2019-04-17 14:21:39 +00:00
Android Build Merger (Role)
20413a0609 Merge "[automerger skipped] Merge "Remove getDefaultTransactionName and getTransactionName from API" am: 8c74e1a7c0 am: 374db029ee -s ours am skip reason: change_id I66d6ba57f0b922335b972e718879c1d7e9b64d79 with SHA1 c5705a82b6 is in history" into qt-dev-plus-aosp 2019-04-17 14:18:15 +00:00
Jiyong Park
2ce741e953 [automerger skipped] Merge "Remove getDefaultTransactionName and getTransactionName from API" am: 8c74e1a7c0 
am: 374db029ee -s ours
am skip reason: change_id I66d6ba57f0b922335b972e718879c1d7e9b64d79 with SHA1 c5705a82b6 is in history

Change-Id: I259201dc94f9ca0b48e8a4b95ac3a46ca9e608a3
 2019-04-17 07:17:23 -07:00
Mehdi Alizadeh
78005865af Merge "Make deprecated AppTarget APIs visible" into qt-dev 
am: de005d26a6

Change-Id: I162c27e353530c6fcf4bed4a677a9d7e262dc05a
 2019-04-17 07:16:42 -07:00
Wayne Ma
1d6c748213 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." 
am: 59d332387c

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5
 2019-04-17 07:15:43 -07:00
Charles Chen
b2e3d1aa25 Merge "Revert "Unify context in ViewRoot"" into qt-dev 
am: 5a2e6040c2

Change-Id: Icc3281cab710b0dfa615a6d7abcafac62cd0466b
 2019-04-17 07:10:45 -07:00
Jiyong Park
374db029ee Merge "Remove getDefaultTransactionName and getTransactionName from API" 
am: 8c74e1a7c0

Change-Id: I89efceac3ee5d19530b4f759303379de91c19b75
 2019-04-17 07:05:57 -07:00
Wayne Ma
59d332387c Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." 2019-04-17 13:58:11 +00:00
waynema
135168455f Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable. 
Test: built, flashed, booted
      atest FrameworksNetTests

Change-Id: I3b4e8672f5273c3baa9378025bfaef2e6514df64
 2019-04-17 13:55:53 +00:00
Mehdi Alizadeh
de005d26a6 Merge "Make deprecated AppTarget APIs visible" into qt-dev 2019-04-17 13:49:22 +00:00
Treehugger Robot
8c74e1a7c0 Merge "Remove getDefaultTransactionName and getTransactionName from API" 2019-04-17 13:46:19 +00:00
Charles Chen
5a2e6040c2 Merge "Revert "Unify context in ViewRoot"" into qt-dev 2019-04-17 13:45:23 +00:00
Anthony Tripaldi
1d26a39975 Merge "Updating accessibility content for buttons in SysUI for captions" into qt-dev 
am: 6a4bf6a397

Change-Id: I87296b91a9d35f445663861c89a8e1ee2368cdf3
 2019-04-17 06:43:57 -07:00
Charles Chen
fd85036cc7 Revert "Unify context in ViewRoot" 
This reverts commit 44f5215ee81d7406b6fb7b1fa0c95f106a35f618.

Reason for revert: <Make Ime test in SystemDecorationTest failed>
Bug: 130715649

Change-Id: I9afb1d5ee7e7a4f1e7de6fa4c7c3ec5dcc336f08
 2019-04-17 13:39:06 +00:00
Anthony Tripaldi
6a4bf6a397 Merge "Updating accessibility content for buttons in SysUI for captions" into qt-dev 2019-04-17 13:25:58 +00:00
Louis Chang
27105fb73a Merge "Unregister ImeInsetsSourceConsumer when focus lost" into qt-dev 
am: c1a0fbcec5

Change-Id: Idde12e81d4f41ab039823470302e099a3c225f68
 2019-04-17 06:22:08 -07:00
Julia Reynolds
d8e8a38670 Merge "Keep a light version of the SBN around" into qt-dev 
am: 57dce7b037

Change-Id: Iab74ea14bb9dafb4b60c9fb66f9d7dcb6db4c91d
 2019-04-17 06:10:07 -07:00
TreeHugger Robot
c1a0fbcec5 Merge "Unregister ImeInsetsSourceConsumer when focus lost" into qt-dev 2019-04-17 13:03:28 +00:00
Richard Uhler
d6f83bb511 Use USER_SYSTEM instead of USER_ALL when enabling rollback. 
The rollback manager needs to know the user that the install session is
associated with. When installing a package for USER_ALL, the install
session is associated with USER_SYSTEM.

This fixes an IllegalArgumentException that would otherwise be thrown if
we ask for all the sessions associated with USER_ALL.

Bug: 130530159
Test: adb install RollbackTestAppAv1.apk
      adb install -i com.android.shell --enable-rollback RollbackTestAppAv2.apk,
          run from both primary and secondary users.

Change-Id: I4a778ffb96cd79875a54da9de9d348d4744a7efb
 2019-04-17 13:59:13 +01:00
Julia Reynolds
57dce7b037 Merge "Keep a light version of the SBN around" into qt-dev 2019-04-17 12:53:42 +00:00