Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
412,897 Commits 3 Branches 0 Tags
1b53374b884ccca1ce8dbd607b024ef7fc2bbf95
Commit Graph

412897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Courtney Goeltzenleuchter
1b53374b88 Merge "EGLAttrib requires special handling in JNI" into qt-dev 
am: 44e30f9a0d

Change-Id: I34f19c30a6a06763e4f1852ac4f11cfcd854410f
 2019-04-05 10:50:01 -07:00
Eric Laurent
d91287e09a Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev 
am: 960c4f06ae

Change-Id: Iaeae8d751ac20a5d86e4774cc9c955c1a6c74c7b
 2019-04-05 10:38:47 -07:00
Eric Laurent
162ac3ad85 Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev 
am: f83192de79

Change-Id: Ifcc857bb35041357178dd58bb7ad462e22b27881
 2019-04-05 10:28:50 -07:00
Android Build Merger (Role)
0ca098c3ab Merge "Merge "Flag to configure model parameters" into qt-dev am: 3b74731f4e" into qt-dev-plus-aosp 2019-04-05 16:58:09 +00:00
Tony Mak
624c594fab Merge "Flag to configure model parameters" into qt-dev 
am: 3b74731f4e

Change-Id: I942d859be8ee77027dfa94da8c004a143193c79e
 2019-04-05 09:57:39 -07:00
Steven Moreland
9f256f617f Merge "Revert "ApplicationLoaders: hard failures & tests"" into qt-dev-plus-aosp 2019-04-05 16:55:59 +00:00
Steven Moreland
4857d1bc55 Revert "ApplicationLoaders: hard failures & tests" 
This reverts commit fd1dad339b.

Fixes: 130027468
Merged-In: I988fe46a7bb810d7c2379e0472404345fd51b685
Change-Id: Ie1c1355b48ea20fb4d50a59b454da2d264b27f42
 2019-04-05 16:54:08 +00:00
Mark Renouf
0b0b2787f7 Merge "Set system gesture exclusion rects for Bubbles" into qt-dev 
am: 0f6b976405

Change-Id: I23df4e99b5e172f6eafdde40acd539ae3965ace8
 2019-04-05 09:49:24 -07:00
Courtney Goeltzenleuchter
44e30f9a0d Merge "EGLAttrib requires special handling in JNI" into qt-dev 2019-04-05 16:37:25 +00:00
Eric Laurent
960c4f06ae Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev 2019-04-05 16:00:00 +00:00
Eric Laurent
f83192de79 Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev 2019-04-05 16:00:00 +00:00
Quang Luong
c75cc8e5e2 Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev 
am: 7b0c0c7694

Change-Id: I854a2106a59542463c3c20383f99d1073203b6ac
 2019-04-05 08:58:29 -07:00
TreeHugger Robot
3b74731f4e Merge "Flag to configure model parameters" into qt-dev 2019-04-05 15:52:17 +00:00
Android Build Merger (Role)
ffe47c199f Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp 2019-04-05 15:46:37 +00:00
Jeff Sharkey
89204bd4dd Merge "Fix isExternalStorageSandboxed() bug." into qt-dev 
am: 10a222bf3c

Change-Id: I644c984dbc3de7518a7bb50427b848aafb3b2944
 2019-04-05 08:45:31 -07:00
TreeHugger Robot
0f6b976405 Merge "Set system gesture exclusion rects for Bubbles" into qt-dev 2019-04-05 15:41:25 +00:00
Sungsoo Lim
84cfdf95b0 [automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout" am: 5b3a0d18ae -s ours 
am: 5b6e4b8901 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife4334651184641bbe867ecf04bd414f38c7ad11
 2019-04-05 08:40:21 -07:00
Evan Laird
236e1c3093 Merge "Expose notification guts on menu shown" into qt-dev 
am: ea2cba2759

Change-Id: I452762ab8c44cc478e647936a3be427e86bc54a3
 2019-04-05 08:28:31 -07:00
TreeHugger Robot
7b0c0c7694 Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev 2019-04-05 15:27:05 +00:00
Jeff Sharkey
10a222bf3c Merge "Fix isExternalStorageSandboxed() bug." into qt-dev 2019-04-05 15:18:23 +00:00
TreeHugger Robot
ea2cba2759 Merge "Expose notification guts on menu shown" into qt-dev 2019-04-05 15:05:15 +00:00
Joel Galenson
77ceb41479 Merge "Update icon for Calendar permission." into qt-dev 
am: fb05af1a17

Change-Id: I013d2d8b514689144482d78bd57d37431017e49e
 2019-04-05 07:48:12 -07:00
Todd Kennedy
4f953527da Merge "fix nullability" into qt-dev 
am: 6cf751cda5

Change-Id: I7bd4eb6d86b4ebd510b7f17d990ef76809e4dd66
 2019-04-05 07:36:53 -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
TreeHugger Robot
fb05af1a17 Merge "Update icon for Calendar permission." into qt-dev 2019-04-05 14:26:14 +00: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
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
Mark Renouf
821e678d8f Set system gesture exclusion rects for Bubbles 
When there is at least one Bubble on-screen, the bounds
of the first (top) bubble are set to exclude system
navigation gestures.

Test: manually w/fully gesture nav enabled
Bug: 126360272
Change-Id: I47a3c69fdc89476805d48b5214a7f05f5d033306
 2019-04-05 13:35:48 +00:00
Tony Mak
20fe187bdf Flag to configure model parameters 
The objective is to allow us to push model parameters by using a settings flag,
without the need of pushing a new model file.

Settings.Global#TEXT_CLASSIFIER_ACTION_MODEL_PARAMS stores a comma
separated string that contains these three fields:
1. required_model_version
2. required_locales
3. serialized_preconditions

To ensure serialized_preconditions is applied to the target model file,
TextClassifierImpl only applies the serialized_preconditions when
required_model_version and required_locales are both met.

Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/
Test: adb shell settings put global text_classifier_action_model_params 'required_model_version=0,required_locales=en,serialized_preconditions=FAAAAAAADgAIAAAAAAAAAAAABAAOAAAAAAAAAA=='
      Observe that the flag is actually applied in the model.
Test: Ensure that finalize is called when the activity is dead.

BUG: 123616497

Change-Id: Ie42dcfeee705c83bbb693a5c1a0fedd0821df5e7
 2019-04-05 14:35:13 +01:00
TreeHugger Robot
f8aeee04c3 Merge "Stores serialized entity data to the extras" into qt-dev 2019-04-05 13:26:20 +00:00
Sungsoo Lim
5b6e4b8901 [automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout" 
am: 5b3a0d18ae -s ours
am skip reason: subject contains skip directive

Change-Id: I15835d75c9a1af2d3875d626615dc3551407589f
 2019-04-05 06:21:06 -07:00
Sungsoo Lim
5b3a0d18ae Merge "DO NOT MERGE: Fix system_server watchdog timeout" 2019-04-05 13:10:03 +00: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
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
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
Susi Kharraz-Post
884e901cf4 Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev 2019-04-05 11:35:38 +00: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
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