Commit Graph

98821 Commits

Author SHA1 Message Date
Ruslan Tkhakokhov
72cb5517dd Merge "Pass excluded keys to the backup agent in onRestore" 2019-12-11 16:23:34 +00:00
TreeHugger Robot
1f0bc68a61 Merge "Fix Resources.ThemeKey.setTo() to fix memory leak." 2019-12-11 15:41:02 +00:00
TreeHugger Robot
e0f469255d Merge "Fix unexpected process restart of size compat mode" 2019-12-11 15:07:37 +00:00
Ruslan Tkhakokhov
d7f5fdb43b Pass excluded keys to the backup agent in onRestore
Pass the list of the keys excluded from KV restore to the backup agent to make it aware of what data has been removed (in case it has any application-level consequences) as well as the data that should be removed by the agent itself.

Bug: 145126096
Test: atest CtsBackupTestCases
Change-Id: I34415b149b379fb5bb67b0fbcd70ec9b9858acfe
2019-12-11 13:43:32 +00:00
Martijn Coenen
d5a091a424 Merge "Disable resetting OP_LEGACY_STORAGE" 2019-12-11 09:22:18 +00:00
Martijn Coenen
d9de49d0e6 Merge changes from topic "fuse_bindmount"
* changes:
  Deal with MediaProvider process dying.
  Don't delay starting sessions.
  Tell StorageSessionController when a user is stopping.
2019-12-11 07:51:37 +00:00
Marcus Hagerott
458bb5a793 Merge "Add methods for the contacts provider local account" 2019-12-11 02:20:33 +00:00
Rhed Jao
d85e2b467c Merge "Accessibility shortcut improvement (5/n)" 2019-12-11 02:17:29 +00:00
TreeHugger Robot
30fd66d53d Merge "Fix InstrumentationInfo publicSourceDir" 2019-12-11 01:46:40 +00:00
TreeHugger Robot
648fb1d9b0 Merge "Isolate mAnimationCompleteLock from mSync." 2019-12-11 00:49:19 +00:00
Winson
22bc5ce7c9 Fix InstrumentationInfo publicSourceDir
Assigned the wrong value, broke tests.

Bug: 145973535

Test: atest com.android.providers.media.scan.ModernMediaScannerTest#testPlaylistWpl succeeds
Change-Id: If222f52b3442cf95c7420056e6e059297584a9a1
2019-12-10 16:02:28 -08:00
TreeHugger Robot
5e68b5c709 Merge "Fix StatsEvent memory usage for pulled events" 2019-12-10 23:18:07 +00:00
Jordan Liu
88704f0b63 Merge "Do not modify passed in intent" 2019-12-10 23:13:15 +00:00
Automerger Merge Worker
0dc6acb831 Merge "Remove usage of IccCardConstants hidden APIs" am: b181ba61e2 am: b09b13cf38 am: 19f573a89b
Change-Id: Ic061e0647d108df6fd4837b89555febd5f85b48f
2019-12-10 22:26:47 +00:00
Automerger Merge Worker
19f573a89b Merge "Remove usage of IccCardConstants hidden APIs" am: b181ba61e2 am: b09b13cf38
Change-Id: I5a8974d8cd5d2af70996ec60eae924ddd435c840
2019-12-10 22:10:05 +00:00
Jayachandran Chinnakkannu
b09b13cf38 Merge "Remove usage of IccCardConstants hidden APIs"
am: b181ba61e2

Change-Id: Id24383c88deff304c7fbbc0a4b6f95019bf35283
2019-12-10 13:53:13 -08:00
Jayachandran Chinnakkannu
b181ba61e2 Merge "Remove usage of IccCardConstants hidden APIs" 2019-12-10 21:31:17 +00:00
Muhammad Qureshi
9e829804e1 Fix StatsEvent memory usage for pulled events
Add usePooledBuffer flag to the Builder which determines whether to reuse
the Buffer's byte array in StatsEvent or use a copy.
The build() function also calls release() on the Buffer
if a copy of the Buffer's byte array is passed to StatsEvent.

Also, for pushed events, release the StatsEvent object and consequently,
the Buffer in StatsLog.write(StatsEvent)

Fixes: 145026572
Fixes: 144126444
Test: bit FrameworksCoreTests:android.util.StatsEventTest
Change-Id: I1cdaf0027b69281cb7cb6f3c8ca923d03829b4dd
2019-12-10 13:27:38 -08:00
Anton Hansson
0bfdf24771 Merge "Hide integrity @IntDefs" 2019-12-10 20:26:54 +00:00
Automerger Merge Worker
e08205b609 Merge "track and report packages with undecorated remoteviews" into qt-qpr1-dev am: 1eb5828022
Change-Id: I24e5eeecdac3a9d72d73fb5bca9cdc7ec202f94c
2019-12-10 18:59:17 +00:00
Marcus Hagerott
66dc2a0ae8 Add methods for the contacts provider local account
Test: added CTS tests and built frameworks/base

Bug: 145690939

Change-Id: I09cdad87543053e58888e58de4d9ca88efb1792d
2019-12-10 09:50:45 -08:00
Anton Hansson
57b6af0417 Hide integrity @IntDefs
Typedefs aren't meant to be exposed in the stubs.

Bug: 145982314
Test: m
Change-Id: I95a5040e2a83c21b736c1b79cf0f492076dfe67a
2019-12-10 17:03:34 +00:00
Charles Munger
d8e9c3a887 Merge "Deprecate AlteredCharSequence" am: ea4916dac7 am: cb90a87d2e
am: ee6451246e

Change-Id: I990dc63ec32cd6ec7c6f783179a887dcac4c264d
2019-12-10 08:35:53 -08:00
TreeHugger Robot
323de93f9d Merge "Add toString() to Display.HDRCapabilities" 2019-12-10 16:34:15 +00:00
Charles Munger
ee6451246e Merge "Deprecate AlteredCharSequence" am: ea4916dac7
am: cb90a87d2e

Change-Id: I55863aae50a20c17b18e25bbfda318eb4efe09d3
2019-12-10 08:31:31 -08:00
Charles Munger
cb90a87d2e Merge "Deprecate AlteredCharSequence"
am: ea4916dac7

Change-Id: I40fe5070fe6475db5eb7f692b78b96e20c30b3d7
2019-12-10 08:27:10 -08:00
Charles Munger
ea4916dac7 Merge "Deprecate AlteredCharSequence" 2019-12-10 16:20:40 +00:00
Riddle Hsu
7f704b5248 Fix unexpected process restart of size compat mode
Since hierarchy merged, the difference between full configuration
and resolved override configuration is no longer the same as the
changes of override configuration. It should be more reliable to
explicitly get the change of the requested override configuration
in display.

Also ensure the popup hint window uses the same window type as
its anchor window, so it won't be occluded by activity.

Bug: 139656157
Test: SizeCompatTests#testResetNonVisibleActivity
Change-Id: I146ca1f55227012da58f5e4d6d85e42a41d1f7cb
2019-12-10 23:42:53 +08:00
Marin Shalamanov
04c6a4696b Add toString() to Display.HDRCapabilities
HdrCapablities in adb shell dumpsys display and in log messages appear
as android.view.Display$HdrCapabilities@49f9cd26. This change adds a
toString() method so HDR Capabilities are visualized in a nice way.

Test: adb shell dumpsys display
Change-Id: I0800ac4f615ca733d0901654184d884dd2b81752
2019-12-10 15:55:34 +01:00
TreeHugger Robot
5905bab2a4 Merge "Add android.annotation.Hide" 2019-12-10 14:52:14 +00:00
Roshan Pius
4f059fa56e Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6 am: e7182d5ba5
am: 3f3dd3b432

Change-Id: I2538620dc77f8bbde5d3589aef22a1675e25fb03
2019-12-10 06:09:15 -08:00
Roshan Pius
3f3dd3b432 Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6
am: e7182d5ba5

Change-Id: I8d21b1465b3a1f5a8b54e2c4fbc8a8d6a7a6a475
2019-12-10 06:04:32 -08:00
Roshan Pius
e7182d5ba5 Merge "InterfaceConfiguration: Don't use @hide Sets class"
am: 2bf6bf92c6

Change-Id: I7c2ec75299170bb0eb06e842b77f798eb060fed0
2019-12-10 05:58:53 -08:00
Treehugger Robot
2bf6bf92c6 Merge "InterfaceConfiguration: Don't use @hide Sets class" 2019-12-10 13:52:48 +00:00
Martijn Coenen
7391820c23 Deal with MediaProvider process dying.
There is no way to recover the FUSE filesystem once the MediaProvider
process has died; the kernel and userspace are out of sync at that
point, and libfuse will return -EIO on all requests.

Now when the process dies, tell StoragemanagerService that it needs to
reset all volumes for a user. Since we currently don't have a way to do
this for one user, just call through to H_RESET. This can be optimized
later. This also means we no longer need to keep a hold of the FUSE fd
in system_server; just pass it along directly when we start a session.

Bug: 137890172
Test: atest AdoptableHostTest
Change-Id: I2e6952ccece6bf2945b4ed81c70330b278554d13
2019-12-10 13:10:51 +01:00
Florian Mayer
9fd210224a Do not cache enabled tags in Java.
As we are elimating the Binder notifications for the sysprop update for
atrace, we no longer have a callback that can be used to read the new
value of the enabled tags.

@CritivalNative calls are very fast (25 ns) so the overhead of always
going to native code to read the tags is negligible.

Test: flash & boot
Test: adb shell su root atrace -t 10 ss
Test: adb shell su root atrace -t 10 wm

Bug: 137366208
Change-Id: I1a07fefd751ee28ca9a632a3d78a2925e8827b9c
2019-12-10 11:30:13 +00:00
Neil Fuller
7daba13fc0 Merge "Extend LocalLog to enable UTC timestamps" am: 9436134056 am: c74594a2e3
am: 746d69afa5

Change-Id: I167f79a33218c5b6593c165f9185663f965dcdcd
2019-12-10 01:54:49 -08:00
Neil Fuller
746d69afa5 Merge "Extend LocalLog to enable UTC timestamps" am: 9436134056
am: c74594a2e3

Change-Id: I417bf9581e3fbce9921e7893c1e63e6dd9a7b30b
2019-12-10 01:50:39 -08:00
Neil Fuller
c74594a2e3 Merge "Extend LocalLog to enable UTC timestamps"
am: 9436134056

Change-Id: I6fcdbaec178f3718b6a3c285f991d6d3c4ec5162
2019-12-10 01:46:13 -08:00
Neil Fuller
9436134056 Merge "Extend LocalLog to enable UTC timestamps" 2019-12-10 09:42:38 +00:00
wilsonshih
29fd42c9d7 Isolate mAnimationCompleteLock from mSync.
Sometimes the test fail because activity starts for more than 5
seconds, and it seems only happen when calling startActivitySync
and running for split screen tests.

If there are two activities A and B are running in the same
process. Consider the following sequence:

1. Start ActivityA then move it to primary split screen.
2. Start ActivityB with startActivitySync, it would launched on
second split screen and wait for enter animation complete.
3. Resume ActivityA naturally, but since ActivityB is blocking mSync
in waitForEnterAnimationComplete, performResume for ActivityA would
waiting for mSync on main thread.
4. Animation complete, scheduleEnterAnimationComplete for ActivityB,
however ENTER_ANIMATION_COMPLETE cannot be executed due to main
thread was blocked.
The deadlock occurs until mAnimationCompleteLock timeout.

Note: There is also another case where the first activity is started
more than 5 seconds at the beginning of the test.

Bug: 127741025
Test: atest ActivityThreadTest
Test: atest android.server.wm.lifecycle
Change-Id: I8b4fe44f962dd31d130ee6b38dabf6e0c90b4060
2019-12-10 13:19:31 +08:00
Meng Wang
d4e90d2e09 Merge "Style fix." 2019-12-10 00:24:32 +00:00
TreeHugger Robot
6a26ddcafc Merge "Move WindowControllerCallback methods into a delagate." 2019-12-09 23:51:21 +00:00
Winson Chiu
26fea7259f Merge "Overlay, actor, and target app visibility handling" 2019-12-09 23:50:31 +00:00
Jordan Liu
e1b7ab1abe Do not modify passed in intent
If the caller wanted to use that intent object after passing it to this
method, it would be mutated in an unexpected way. Instead we create a
copy of the intent and broadcast that.

Bug: 144108192
Test: atest com.android.internal.telephony.CellBroadcastIntentsTest
Change-Id: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
2019-12-09 15:45:21 -08:00
Meng Wang
3c97f033c5 Style fix.
To avoid merge conflict with internal branch.

Test: make
Change-Id: I04636443ea70f0cbac784a910c3d57fa80bd6bcc
Merged-In: I1b750751148925b4a7bd94553318907654012fc1
2019-12-09 23:30:16 +00:00
Chester Hsieh
5aa92326c4 Merge "Add package name to DDM APNM packet" 2019-12-09 22:41:02 +00:00
Alex Buynytskyy
6f5822e5d0 Merge "Additional documentation on transfer statuses." 2019-12-09 22:01:40 +00:00
Winson Chiu
f0ff68f625 Merge changes from topic "androidpackage"
* changes:
  Critical fixes for AndroidPackage migration
  Revert Revert PackageParser#Package fixes
  Revert "Revert "Deprecate PackageParser#Package""
2019-12-09 21:46:13 +00:00
Sunny Goyal
9d734ff4cd Merge "Cleaning up listener when task completes" 2019-12-09 21:15:02 +00:00