Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
413,019 Commits 3 Branches 0 Tags
115edcae44f29f72ebdf4399a80977dbf5b53ade
Commit Graph

413019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
115edcae44 Merge "Don't bother resetting settings; they use testable context" 2019-04-05 15:00:33 +00:00
Todd Kennedy
323f95552a [automerger skipped] Merge "fix nullability" into qt-dev am: 6cf751cda5 
am: 4f953527da -s ours
am skip reason: change_id I43e02551ced8a6aa51b84dd8df7e57e75e1d58a9 with SHA1 6ee36a1d7c is in history

Change-Id: I21082941edd8c5dc811bf6e9e4aff392fa1f4d28
 2019-04-05 07:52:01 -07:00
Matt Pietal
ecd7555226 Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev am: 4c648a027f 
am: 0bd4d885ca

Change-Id: I685009fadfb07816983d057176d3118a3e3caf32
 2019-04-05 07:40:47 -07:00
Todd Kennedy
4f953527da Merge "fix nullability" into qt-dev 
am: 6cf751cda5

Change-Id: I7bd4eb6d86b4ebd510b7f17d990ef76809e4dd66
 2019-04-05 07:36:53 -07:00
Amin Shaikh
54f32b9357 Merge "Update theme icon packs." into qt-dev am: 3642e79fda 
am: f8d216102e

Change-Id: Ib01f67f1580a0399b815ea56b5d4299ee2035323
 2019-04-05 07:30:32 -07:00
Matt Pietal
0bd4d885ca Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev 
am: 4c648a027f

Change-Id: I8e1d67837dd591d53cd3750919e17d3bb72f2247
 2019-04-05 07:26:42 -07:00
Amin Shaikh
f8d216102e Merge "Update theme icon packs." into qt-dev 
am: 3642e79fda

Change-Id: If1cbd443ac1f9c6ccb384ed5669d7aab9f1554dc
 2019-04-05 07:20:49 -07:00
Todd Kennedy
6cf751cda5 Merge "fix nullability" into qt-dev 2019-04-05 14:16:37 +00:00
TreeHugger Robot
4c648a027f Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev 2019-04-05 14:10:41 +00:00
TreeHugger Robot
3642e79fda Merge "Update theme icon packs." into qt-dev 2019-04-05 14:08:52 +00:00
TreeHugger Robot
2e42a4a429 Merge "Revert "ApplicationLoaders: hard failures & tests"" 2019-04-05 14:08:27 +00:00
Tony Mak
c882db9723 Merge "Stores serialized entity data to the extras" into qt-dev am: f8aeee04c3 
am: b252a3f7c3

Change-Id: I2ac27681c4dba715ada9b365e003e1387d639191
 2019-04-05 06:58:47 -07:00
Narayan Kamath
7f421df3ff [automerger skipped] Merge "Fix rollbacks in multi-user case." into qt-dev am: fb1a20e4fb 
am: 70bf1bcd1b -s ours
am skip reason: change_id I1a7cf101b3bc3575421629c4bf0ff63418eb8731 with SHA1 d81ff97866 is in history

Change-Id: I0fa94ab5297cdab7a5e978824c42e276afb79c5c
 2019-04-05 06:52:31 -07:00
Susi Kharraz-Post
b7f11070eb Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev am: 884e901cf4 
am: 37a66aff6a

Change-Id: If474da4bdf66fd4c2392d0c0174d3e91614bc876
 2019-04-05 06:39:29 -07:00
Tony Mak
b252a3f7c3 Merge "Stores serialized entity data to the extras" into qt-dev 
am: f8aeee04c3

Change-Id: I422d2e65861e528081e4878a7f8a0c9b24376f36
 2019-04-05 06:37:09 -07:00
TreeHugger Robot
f8aeee04c3 Merge "Stores serialized entity data to the extras" into qt-dev 2019-04-05 13:26:20 +00:00
Tim Murray
67aae03704 Merge "Merge "zygote: initialize ashmem early" am: 6c155a2cf7 am: 38326bd809" into qt-dev-plus-aosp 
am: 7039de7e09

Change-Id: I24e4f67d3f7c02e606143a3db260ad5aa4c1cdb8
 2019-04-05 06:25:51 -07:00
Joonghong Park
a9f9880558 Merge "Merge "Fix BT keeping wrong state issue" am: 7cd490c941 am: 4f73919dd7" into qt-dev-plus-aosp 
am: ec5db12440

Change-Id: I801f311bd9f8450239e4f420877de6eea54e85e2
 2019-04-05 06:05:29 -07:00
Remi NGUYEN VAN
13125e8b27 Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 am: 47c803e334" into qt-dev-plus-aosp 
am: 199e67ea82

Change-Id: I8b544c083f5a493786efe7a84f43a32507b089ac
 2019-04-05 05:52:31 -07:00
Narayan Kamath
70bf1bcd1b Merge "Fix rollbacks in multi-user case." into qt-dev 
am: fb1a20e4fb

Change-Id: I006cae670e3c863d06c408cb743f9854a1fd7199
 2019-04-05 05:51:01 -07:00
Narayan Kamath
fb1a20e4fb Merge "Fix rollbacks in multi-user case." into qt-dev 2019-04-05 12:39:42 +00:00
Remi NGUYEN VAN
77f9d85f12 Merge "Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d am: 2e74de0a31" into qt-dev-plus-aosp 
am: d61c984e06

Change-Id: If4a75f23c6c0589c23cadce3b088966649062463
 2019-04-05 05:39:23 -07:00
Matt Pietal
4e2e36323d Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2 
Will eventually merge with suggested apps

Bug: 129979509
Test: ChooserActivityTest
Change-Id: I0e5f5a42155c83c77c6f6e355289218bc88033e7
 2019-04-05 08:32:47 -04:00
Sundong Ahn
bc6790be79 Merge "Merge "Add Vts test for xsd_config" am: fd7bbebeaa am: 8cf6ace11d" into qt-dev-plus-aosp 
am: b99d71f607

Change-Id: I923d04ea7e9d4f4ebeba86e0815415916c1e1631
 2019-04-05 05:22:35 -07:00
Florian Mayer
21a862cc5c Revert "ApplicationLoaders: hard failures & tests" 
This reverts commit 0975a412b3.

Reason for revert: This broke qt-dev-plus-aosp

Change-Id: I988fe46a7bb810d7c2379e0472404345fd51b685
 2019-04-05 12:12:22 +00:00
Richard Uhler
82913b7123 Fix rollbacks in multi-user case. 
There are a few assumptions in the rollback manager that fail in the
multi-user case that need to be fixed:
* getAllSessions only returns sessions for the specific user.
* Session callbacks are only called on sessions associated with the
  registered user.
* getPackageInfo only returns info for the specific user.

Fix these issues so that rollbacks will work properly, in particular
when the initial install session is owned by a non-system user.

Bug: 129809507
Bug: 129397974

Test: On single user device: atest RollbackTest StagedRollbackTest
Test: On primary user of multi-user device: atest RollbackTest StagedRollbackTest
Test: On multi user device manually:
    adb install RollbackTestAppAv1.apk
    adb install --user 10 --enable-rollback RollbackTestAppAv2.apk
    -- verify the install succeeded --
    adb shell pm rollback-app com.android.tests.rollback.testapp.A
    -- verify the rollback succeeded --

Test: On multi user device manually:
    adb install RollbackTestAppAv1.apk
    adb install --staged --user 10 --enable-rollback RollbackTestAppAv2.apk
    adb reboot
    -- verify the install succeeded --
    adb shell pm rollback-app com.android.tests.rollback.testapp.A
    adb reboot
    -- verify the rollback succeeded --

(cherry picked from commit d81ff97866)

Merged-In: I1a7cf101b3bc3575421629c4bf0ff63418eb8731
Change-Id: I1a7cf101b3bc3575421629c4bf0ff63418eb8731
 2019-04-05 11:54:44 +00:00
Susi Kharraz-Post
37a66aff6a Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev 
am: 884e901cf4

Change-Id: I7c67153c1233a6cf4a9bb06f21c6f8cf1f3d8653
 2019-04-05 04:46:12 -07:00
Remi NGUYEN VAN
fe71be2b04 Merge "Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 1ddf974859 am: 6652f5242a" into qt-dev-plus-aosp 
am: d77d95df7a

Change-Id: I66d7b3e4fbfa32bb0bc853e8cf9399031daff8a9
 2019-04-05 04:44:45 -07:00
Susi Kharraz-Post
884e901cf4 Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev 2019-04-05 11:35:38 +00:00
Sasha Smundak
0f0803ad07 Merge "[automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 am: e9834d4fbf -s ours 
am: a0cae6d209 -s ours
am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history

Change-Id: I56058b46b57a34329648d40e6478511808bbb0e3
 2019-04-05 04:31:19 -07:00
Remi NGUYEN VAN
f85635e8cf Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 am: 2d7dbf8ea3" into qt-dev-plus-aosp 
am: 55f9b6eaca

Change-Id: I2b1dfae776ecd4f5d68c1a8c5a63b3fa12230729
 2019-04-05 04:23:40 -07:00
Sundong Ahn
a523e5e806 Merge "Merge "Change to choice" am: 5baeab86a0 am: a409e9fbb7" into qt-dev-plus-aosp 
am: f99d86e427

Change-Id: Ic3c4f82fc57d40d6bca0c36c6033d0b040dd8f1a
 2019-04-05 04:08:04 -07:00
Android Build Merger (Role)
7039de7e09 Merge "Merge "zygote: initialize ashmem early" am: 6c155a2cf7 am: 38326bd809" into qt-dev-plus-aosp 2019-04-05 10:58:55 +00:00
Tim Murray
00d9f15842 Merge "zygote: initialize ashmem early" am: 6c155a2cf7 
am: 38326bd809

Change-Id: I6997125bdd2e14b66a0b7d9d918793432d4a1794
 2019-04-05 03:58:00 -07:00
Steven Moreland
ad2e77bdb2 [automerger skipped] Merge "Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 am: be708ba226" into qt-dev-plus-aosp 
am: 44e3a56f93 -s ours
am skip reason: change_id Ib259bcdf472e6a2f7f6b1071bb70cfead4502231 with SHA1 0975a412b3 is in history

Change-Id: Ie7744da458f779fca3588e52b1ff17efa5253791
 2019-04-05 03:54:04 -07:00
Android Build Merger (Role)
ec5db12440 Merge "Merge "Fix BT keeping wrong state issue" am: 7cd490c941 am: 4f73919dd7" into qt-dev-plus-aosp 2019-04-05 10:52:48 +00:00
Joonghong Park
5488beb415 Merge "Fix BT keeping wrong state issue" am: 7cd490c941 
am: 4f73919dd7

Change-Id: Ib54b81c69ec3c3ae6d0b9306459d512f43925d27
 2019-04-05 03:52:17 -07:00
Android Build Merger (Role)
199e67ea82 Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 am: 47c803e334" into qt-dev-plus-aosp 2019-04-05 10:48:02 +00:00
Remi NGUYEN VAN
d0fe9b1a9d Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 
am: 47c803e334

Change-Id: I5dc4c3f4a31e65409e86f059c727abe665708b3b
 2019-04-05 03:47:33 -07:00
Android Build Merger (Role)
d61c984e06 Merge "Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d am: 2e74de0a31" into qt-dev-plus-aosp 2019-04-05 10:43:22 +00:00
Remi NGUYEN VAN
d280d6ae72 Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d 
am: 2e74de0a31

Change-Id: I51bdb26d5c58a6a97e3a22711a822452985f4f95
 2019-04-05 03:42:54 -07:00
Android Build Merger (Role)
b99d71f607 Merge "Merge "Add Vts test for xsd_config" am: fd7bbebeaa am: 8cf6ace11d" into qt-dev-plus-aosp 2019-04-05 10:38:50 +00:00
Sundong Ahn
3b04ea319a Merge "Add Vts test for xsd_config" am: fd7bbebeaa 
am: 8cf6ace11d

Change-Id: I5f8420571e2465048bc5b959da5dea2d66d35d05
 2019-04-05 03:36:28 -07:00
Zimuzo
ecec311d68 Merge "Merge "Refactor PackageWatchdog explicit health checks" into qt-dev am: e0283ded0a" into qt-dev-plus-aosp 
am: ed8907bf93

Change-Id: I4dcf25b6eae1c1e06fc288e4e49d7f199b3be8af
 2019-04-05 03:36:19 -07:00
Android Build Merger (Role)
d77d95df7a Merge "Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 1ddf974859 am: 6652f5242a" into qt-dev-plus-aosp 2019-04-05 10:32:06 +00:00
Remi NGUYEN VAN
5059e03eb6 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 1ddf974859 
am: 6652f5242a

Change-Id: If5c236c85585a440bfb645cff9d3cb0bb4e11102
 2019-04-05 03:31:36 -07:00
Android Build Merger (Role)
a0cae6d209 Merge "[automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 am: e9834d4fbf -s ours am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history" into qt-dev-plus-aosp 2019-04-05 10:27:19 +00:00
Sasha Smundak
8961436581 [automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 
am: e9834d4fbf -s ours
am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history

Change-Id: I5e8c9b4fe35d794d1e050aa38645d55a5ce31643
 2019-04-05 03:26:51 -07:00
Tyler Gunn
02ea4114c2 resolve merge conflicts of 37f6620029 to stage-aosp-master am: 4d97d127fd 
am: 3fa5ea624f

Change-Id: If35a6a7bdc1191ae8eda65a0062666dc03febea2
 2019-04-05 03:24:53 -07:00
Android Build Merger (Role)
55f9b6eaca Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 am: 2d7dbf8ea3" into qt-dev-plus-aosp 2019-04-05 10:22:45 +00:00