Commit Graph

81136 Commits

Author SHA1 Message Date
Seigo Nonaka
065c59beaf Revert "Implement family fallback." DO NOT MERGE
This reverts commit 0d253e46aa.

The original CL changed Typeface internal methods and broke
TypefaceCompatApi26Impl in support library which uses reflections.
Ideally, TypefaceCompatApi26Impl must fall back to public API
implementation but due to lack of method availability check, it ended up
crashing the application.

The original patch didn't change any behaviors in MR1, so reverting
that change is the best solution for MR1.

Bug: 64033594
Change-Id: Ie86afeb1b809e57915d62c1db5a70c8d210d2354
Test: N/A
2017-07-26 22:21:14 +00:00
TreeHugger Robot
f0176103a2 Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev 2017-07-25 19:35:03 +00:00
TreeHugger Robot
36d8b489d2 Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev 2017-07-25 18:09:42 +00:00
Calin Juravle
96995bb7a2 Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev 2017-07-25 16:54:06 +00:00
TreeHugger Robot
be74124264 Merge "Add API for virtual preloads" into oc-mr1-dev 2017-07-25 16:13:08 +00:00
Todd Kennedy
78a72501af Add API for virtual preloads
Virtual preloads are applications that aren't actually on the
/system partition, but, act as if they were. One such distinction
is that these apps receive Intent.ACTION_BOOT_COMPLETED and start
out of the stopped state.

Change-Id: I812d3e7008b9d87e84aa33dbc4b3d8e8b334533c
Fix: 34855677
Test: Manual
Test: Install an app with "--preload"
Test: See that it receives Intent.ACTION_BOOT_COMPLETED
2017-07-25 06:48:39 -07:00
Andreas Gampe
032a929542 Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.

Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.

(cherry picked from commit 27497c6dfc)

Bug: 63904739
Bug: 63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
2017-07-24 19:59:13 -07:00
Ajay Panicker
4c0900102b Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am: aaf3860941

Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
2017-07-25 02:19:31 +00:00
Ajay Panicker
aaf3860941 Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev 2017-07-25 02:11:26 +00:00
Calin Juravle
2f09ff38f6 Fix system server compilation in ZygoteInit
The code which dexopt SystemServer in ZygoteInit used to pass the
sharedLibrary string in the old format.

This CL updates the classPath string to the new class loader context
encoding.

Bug: 63941300
Test: compile WITH_DEXPREOPT=false and WITH_DEXPREOPT_BOOT_IMG_ONLY=false
and check that when the device boots the correct context is passed to
dex2oat.

(cherry picked from commit b0dede3ec2)

Change-Id: Ie27cd21b0b9c8b7e226bce74dfa297569ac12317
2017-07-24 18:40:17 -07:00
TreeHugger Robot
a4a68a1481 Merge "Refurbish granting mechanism" into oc-dr1-dev 2017-07-25 00:05:30 +00:00
TreeHugger Robot
70c72263ac Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev 2017-07-24 20:21:15 +00:00
Janis Danisevskis
e06f533726 Refurbish granting mechanism
Keystore stores key blobs in with filenames that include the symbolic
name and the uid of the owner. This behaviour should have been
completely opaque to the user keystore. However, the granting mechanism,
by which an app can allow another app to use one of its keys, leaked the
internal structure in that the grantee had to specify the key name with
the granter's uid prefix in order to use the granted key. This in turn
collided with prefix handling in other parts of the framework.

This patch refurbishes the granting mechanism such that keystore can
choose a name for the grant. It uses the original symbolic key name as
prefix and appends _KEYSTOREGRANT_<grant_no> where the grant_no is
chosen as first free slot starting from 0. Each uid has its own grant_no
space.

This changes the grant call such that it now returns a string, which is
the alias name of the newly created grant. The string is empty if the
grant operation failed.

As before apps can still mask granted keys by importing a key with the
exact same name including the added suffix. But everybody deserves the
right to shoot themselves in the foot if they really want to.

Bug: 37264540
Bug: 62237038
Test: run cts-dev --module CtsDevicePolicyManagerTestCases --test
          com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
	  because it grants a key
Merged-In: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Change-Id: I047512ba345c25e6e691e78f7a37fc3f97b95d32
2017-07-24 10:58:33 -07:00
Makoto Onuki
4fdefef7a1 Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev 2017-07-24 17:42:31 +00:00
Jorim Jaggi
7f58322d51 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
2017-07-24 14:14:34 +00:00
Jorim Jaggi
6498f96283 Revert "Fix jank when switching themes"
This reverts commit e5d0b9dddb.

Fixes crashloop with lock pattern

Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes: 63980375
2017-07-24 15:53:42 +02:00
Michael Wright
d487520e4c Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am: 149ff697ff

Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
2017-07-24 12:52:43 +00:00
TreeHugger Robot
149ff697ff Merge "Remove non-safe mode boot vibration." into oc-dr1-dev 2017-07-24 12:46:25 +00:00
Selim Cinek
3a82a4a0f2 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
2017-07-23 12:57:19 +00:00
TreeHugger Robot
8650c7c0f1 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev 2017-07-23 12:51:43 +00:00
Lucas Dupin
902ba7bab5 Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5
2017-07-22 04:52:31 +00:00
TreeHugger Robot
a74f575ff9 Merge "Fix jank when switching themes" into oc-dr1-dev 2017-07-22 04:46:19 +00:00
TreeHugger Robot
572cb5242d Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev 2017-07-22 03:01:02 +00:00
Makoto Onuki
5eb5ec71fa Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am: 5bbf44e715

Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142
2017-07-22 00:57:59 +00:00
TreeHugger Robot
5bbf44e715 Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev 2017-07-22 00:45:24 +00:00
Bookatz
63959bae98 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
2017-07-22 00:41:57 +00:00
TreeHugger Robot
2337b3ba84 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev 2017-07-22 00:35:10 +00:00
David Friedman
93a1ab8ba1 Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334
am: f20c492190

Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
2017-07-21 23:57:01 +00:00
Makoto Onuki
97f82f28da Don't keep parceled extras for history broadcasts.
On dumpsys we do show history broadcast intents with extras, but
if an intent's extras are still parceled, we can't show anything
(but the length) anyway, so let's just remove them, because sometimes
they contain heavy objects such as bitmaps.

Bug: 62144301
Test: manual tests: Boot, add account start apps, insert SIM
Change-Id: Ia64dd46d66fba3098e32c435509f4940ae978710
2017-07-21 16:51:16 -07:00
Andrii Kulian
504ea09356 Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
* changes:
  DO NOT MERGE VirtualDisplay wrapper with input forwarding
  DO NOT MERGE ActivityView be gone!
2017-07-21 23:16:24 +00:00
Romain Guy
0bbf0b41cc Expose shared buffer mode/auto refresh on Surface
These features can be set on a surface to reduce perceived latency
at the expense of visible tearing.

Bug: 63858546
Test: Manual, CTS test coming

Change-Id: Ica3f480bd1cb8f77dff57218d2fa8783433d3396
2017-07-21 16:11:17 -07:00
David Friedman
f20c492190 Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev
am: e4d0557334

Change-Id: I931088e43f29707e1ab5d9764a06adbbe5af1d7e
2017-07-21 23:11:16 +00:00
David Friedman
e4d0557334 Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev 2017-07-21 23:01:56 +00:00
Makoto Onuki
fdc5723076 Persist/pacel # of periodic syncs properly.
(Note it shouldn't be persisting parceled data in the first place.  There's
already a bug filed for that.)

Bug 63935632
Test: manaul test

Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
2017-07-21 15:30:35 -07:00
Bookatz
993a0be676 Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().

Bug: 62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
2017-07-21 15:26:13 -07:00
Bookatz
94c5a313d7 Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.

Bug: 63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans

Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
2017-07-21 21:46:01 +00:00
Andrii Kulian
d313469e28 DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.

Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.

Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
  app, then it must be embeddable and launcher must have
  permission to embed.

Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-21 13:14:37 -07:00
Andrii Kulian
94e82d9b0e DO NOT MERGE ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.

Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
2017-07-21 13:14:19 -07:00
Julia Reynolds
04964fe069 Merge "Fix xml loading for managed services" into oc-mr1-dev 2017-07-21 19:52:50 +00:00
Christine Franks
59d0441b0c Merge "Remove RetailDemoModeService" into oc-mr1-dev 2017-07-21 18:53:19 +00:00
Christine Franks
484115b77d Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev 2017-07-21 18:53:16 +00:00
Albert Chaulk
95a3528866 Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am: c48e304bbf

Change-Id: I1c93664e2300cb9e234cfbc1c453da30a60e61af
2017-07-21 18:33:53 +00:00
Albert Chaulk
c48e304bbf Merge "Add modified API to send more information to VrCore" into oc-dr1-dev 2017-07-21 18:22:38 +00:00
Michael Wright
33d6c08aa6 Remove non-safe mode boot vibration.
Ding, dong the BZZZT is dead.

Bug: 22414771
Test: manual
Change-Id: I011a9b475a6497db6e9440647d6d5c60dcf171b7
2017-07-21 19:11:24 +01:00
TreeHugger Robot
a8d14a6ea0 Merge "Unhide invalidateColors API" into oc-mr1-dev 2017-07-21 17:51:27 +00:00
Jeff Sharkey
84c6684bba Merge "Expose SubscriptionPlan API." into oc-mr1-dev 2017-07-21 17:14:30 +00:00
Julia Reynolds
d1bf5f0108 Fix xml loading for managed services
Noticed while adding a shell cmd to toggle notification assistants,
which is also included

Bug: 62263757
Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
(cherry picked from commit 88facd4d9a)
2017-07-21 13:07:48 -04:00
Jorim Jaggi
d8aa259df1 Merge "Fix snapshots for dialogs" into oc-dr1-dev
am: 089d45de8f

Change-Id: I6429fcdc5c012f653143cb8b8161b8f1626293f9
2017-07-21 16:17:39 +00:00
Jorim Jaggi
089d45de8f Merge "Fix snapshots for dialogs" into oc-dr1-dev 2017-07-21 16:10:52 +00:00
Christine Franks
b7c929977c DO NOT MERGE - Remove RetailDemoModeService
Bug: 62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
2017-07-21 15:51:32 +00:00