Commit Graph

11495 Commits

Author SHA1 Message Date
Lucas Dupin
1446809f30 Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30
2017-07-07 02:42:35 +00:00
TreeHugger Robot
b1ab0ff21e Merge "Hide all color hints references" into oc-dr1-dev 2017-07-07 00:12:08 +00:00
Neil Fuller
78526c3341 Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d am: 06c2f8e346
am: 61ea5e6c8f

Change-Id: If516a2daeeb38490add4570bbd937801906b356d
2017-07-03 09:53:28 +00:00
Neil Fuller
61ea5e6c8f Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d
am: 06c2f8e346

Change-Id: I23f60a0c235780afd551cbe5f546918317bfe098
2017-07-03 09:47:03 +00:00
Neil Fuller
06c2f8e346 Merge "Add dumpsys support to RulesManagerService"
am: 348a1d635d

Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
2017-07-03 09:41:47 +00:00
Neil Fuller
87b1128ddc Add dumpsys support to RulesManagerService
Override the dump method so RuleManagerService can dump its state
into logs. Crude argument support has been added for dumping
specific fields in an easy to process way (for test scripts to use).

Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Test: Manual; adb shell dumpsys timezone [-format_state piscotz]
Bug: 31008728
Change-Id: I0ad83aa245232ed0b983ceacd8accfb876824d6f
2017-06-30 18:18:07 +01:00
Christopher Tate
0d95a0eefa Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
2017-06-29 22:34:22 +00:00
TreeHugger Robot
2de66f7be1 Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev 2017-06-29 22:26:34 +00:00
Santos Cordon
99eac47966 Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am: 67143a8cfc

Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b
2017-06-29 21:31:53 +00:00
Santos Cordon
627a68f852 Add ability to turn off VR virtual display functionality.
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.

Bug: 62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.

Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
2017-06-29 19:01:39 +00:00
Neil Fuller
488469fac3 Merge "Use sendBroadcastAsUser rather than sendBroadcast" am: d129a14647 am: 93b232db41
am: 95eab26704

Change-Id: I3fee39d494d9ea041351218e72ebbe65bdb07637
2017-06-29 11:53:48 +00:00
Neil Fuller
95eab26704 Merge "Use sendBroadcastAsUser rather than sendBroadcast" am: d129a14647
am: 93b232db41

Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1
2017-06-29 11:45:04 +00:00
Neil Fuller
93b232db41 Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am: d129a14647

Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
2017-06-29 11:37:13 +00:00
Robert Carr
c09f11ad36 Merge "Disable requestVisibleBehind." into oc-dev am: e33c33e38a
am: 1c89591f94

Change-Id: Ife4908481549c956a23118ce5f8422161cc73d9e
2017-06-29 02:24:23 +00:00
Robert Carr
da72cb368e Merge "Disable requestVisibleBehind." into oc-dev
am: e33c33e38a

Change-Id: I29e5507d716e19060d4c0578d4b4df3bcfa30069
2017-06-29 02:15:32 +00:00
Robert Carr
1c89591f94 Merge "Disable requestVisibleBehind." into oc-dev
am: e33c33e38a

Change-Id: Ie0733cb79acbe34536c4c031f1234dac134841d3
2017-06-29 00:26:35 +00:00
TreeHugger Robot
e33c33e38a Merge "Disable requestVisibleBehind." into oc-dev 2017-06-29 00:17:19 +00:00
Lucas Dupin
bdffdd52fa Hide all color hints references
Change-Id: I9714bf8a982e0f58cab7e707129e81ee3d8cf5db
Fixes: 63096109
Test: make
2017-06-28 09:49:47 -07:00
Christopher Tate
dbf4a9c274 Don't synchronize inside getWallpaperColors()
Reading the current wallpaper's palette doesn't involve any state
inside the WallpaperManager instance, so there's no reason to
apply synchronization in the first place.  By doing so we were
inducing a great deal of lock contention, since the system side
of the operation can sometimes take a long time to execute.

Bug 63065764
Test: manual

Change-Id: I6f5f67a0819da23245a4ad5334f0942011467f7c
2017-06-27 15:27:36 -07:00
Robert Carr
8661c5e519 Disable requestVisibleBehind.
As there is no caller for the SystemAPI convertToTranslucent, there is no situation
where requestVisibleBehind will actually result in the activity becoming
visible behind. However we have bugs in the requestVisibleBehind code-path,
so rather than fix them...it seems better to just prevent ourselves from
running in to them. Full deletion of the code-path is scheduled for post-O
branches.

Change-Id: I6e7c79e036986564d2d443a603e63c341de23057
Fixes: 62512584
Test: Repro from bug. go/wm-smoke.
2017-06-27 13:46:14 -07:00
Neil Fuller
23eb3a19b8 Use sendBroadcastAsUser rather than sendBroadcast
According to messages in the logcat sendBroadcastAsUser
is the better option.

Test: Manual
Bug: 31008728
Change-Id: I06bcd3c53878fc2b1b817337ea8719fcc4975501
2017-06-27 19:04:50 +01:00
Bryce Lee
ee289616fb Merge "Add aborted start result." into oc-dev am: 8796c20dae
am: 943794bb70

Change-Id: I9bf7aa7a5b1e8fbf7ccdea5a883c0ce98fa8f3ff
2017-06-27 04:27:08 +00:00
Bryce Lee
943794bb70 Merge "Add aborted start result." into oc-dev
am: 8796c20dae

Change-Id: I849ea5bfce87bd6a9264308e40242f6a2026713c
2017-06-27 04:20:35 +00:00
Bryce Lee
0259473b75 Merge "Add aborted start result." into oc-dev
am: 8796c20dae

Change-Id: I893c429db5c71747fda8e390ee7d9d786ce0c53a
2017-06-27 04:20:34 +00:00
Bryce Lee
f9d4954f30 Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.

This CL adds a new start result type to capture this internally.

Bug: 38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
2017-06-26 16:27:32 -07:00
Richard Uhler
a18500b508 Fix bug in reporting SwapPss in dumpsys meminfo.
am: a178205e8b

Change-Id: I49c805c6fab673008b18a5a8deb256ec2a5fb970
2017-06-26 09:01:32 +00:00
Richard Uhler
a178205e8b Fix bug in reporting SwapPss in dumpsys meminfo.
Bug: 29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
      for dalvik and native.

Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
2017-06-26 06:34:04 +00:00
Ying Xu
a465181691 Merge "Add flag to wipe eUICC data" into oc-dr1-dev
am: 05ce703c87

Change-Id: I556f01f7f317e639f8a33a981154721e53a95641
2017-06-23 21:04:25 +00:00
Ying Xu
05ce703c87 Merge "Add flag to wipe eUICC data" into oc-dr1-dev 2017-06-23 20:52:56 +00:00
yinxu
f4f9cec234 Add flag to wipe eUICC data
Add a new flag in the DevicePolicyManager so that we can Use
EuiccManager#eraseSubscriptions(PendingIntent) to erase all the carrier data
from eUICC chip if the user choose to "ERASE" from the Android device manager.

Bug: 37277944
Test: E2E
Change-Id: Ia78090a00d956c645725be4fd591e02ded8ec467
2017-06-23 10:56:55 -07:00
Seigo Nonaka
c25c3da8b6 Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.

Bug: 62813533
Bug: 62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit 6d6cd68660)
2017-06-23 12:27:23 +00:00
Seigo Nonaka
b7773ce875 Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.

Bug: 62813533
Bug: 62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit 6d6cd68660)
2017-06-23 10:02:59 +00:00
Seigo Nonaka
ba12631bba Merge "Stop loading other package's font by default." into oc-dev
am: 824d75e0e1

Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
2017-06-23 04:23:44 +00:00
Seigo Nonaka
80f6a985c3 Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.

This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.

Bug: 62813533
Bug: 62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
2017-06-22 19:07:17 -07:00
Neil Fuller
9b28a61fcf Merge "Fix code and test related to rules version check" am: a3579d4b84 am: c506ade205
am: af32c3d234

Change-Id: I2dc13436ceb93eb620dcaaa6d141210dc57ea1fc
2017-06-22 21:56:18 +00:00
Neil Fuller
af32c3d234 Merge "Fix code and test related to rules version check" am: a3579d4b84
am: c506ade205

Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
2017-06-22 21:49:28 +00:00
Neil Fuller
0153481a22 Fix code and test related to rules version check
Fix code and test related to an incorrectly implemented
rules version check.

This meant that a device could not return the rules version
it shipped with.

Another unused (and also confusing) method and
associated test is being deleted here.

To run tests:
make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728
Change-Id: I31b55e88072dd73055cb3d8cf252be6eac920322
2017-06-22 21:24:54 +01:00
Jason Monk
2693dd810d Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
am: cc9ff706a4

Change-Id: I9852ed8eeeb32aff7150b367c1ba2a6861eddb43
2017-06-22 19:45:06 +00:00
Jason Monk
4d0fd71700 Add API to allow apps more control over instantiation
Let them control construction of standard manifest elements (like
activities) through Application. This will allow for things like
dependency injection and class loader magic.

Test: manual
Bug: 62534409
Change-Id: I5fc2a7ec52bb0e232966704d16f94a192d033267
Merged-In: Iaa2215b225c3b97f4e9ac809dfe499f98c7ad5f1
2017-06-22 13:18:27 -04:00
Svetoslav Ganov
a6465a13cf Merge "Support native shared libs" into oc-dr1-dev
am: 77dea6284a

Change-Id: I69205d02358b025ed00dc7141cb87fd692d0b883
2017-06-21 17:38:27 +00:00
Svetoslav Ganov
40610e3a14 Support native shared libs
resolve merge conflict for ac9b6706b

Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.

Test: CTS tests in this topic

bug:62720360

Change-Id: Ie3f203db12a3f3826e114c219a8341d9acab604f
2017-06-21 15:21:22 +00:00
Dianne Hackborn
7e4a1ded83 Merge "Small doc fix." into oc-dev am: 0f98ddaa01
am: e06356904f

Change-Id: I49e7d6174f812ee449435b91f0858040a261692c
2017-06-21 02:52:52 +00:00
Dianne Hackborn
e7de4716f0 Merge "Small doc fix." into oc-dev
am: 0f98ddaa01

Change-Id: Iac5b780a9894ce3a5433d1c434286e01313e7f99
2017-06-21 02:42:23 +00:00
Dianne Hackborn
e06356904f Merge "Small doc fix." into oc-dev
am: 0f98ddaa01

Change-Id: Ib0da1db5f79b054f3826e0b3b3d0d3e4716530f2
2017-06-21 02:02:48 +00:00
TreeHugger Robot
0f98ddaa01 Merge "Small doc fix." into oc-dev 2017-06-21 01:59:02 +00:00
Svetoslav Ganov
d46d0386e2 Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
am: 324c41ba89

Change-Id: Ia774a4f3bd1af7c334b2844f87fa8850de48f2f7
2017-06-21 01:19:42 +00:00
Svetoslav Ganov
324c41ba89 Merge "[DO NOT MERGE] Support native shared libs" into oc-dev 2017-06-21 01:06:22 +00:00
Svet Ganov
f8579581c1 [DO NOT MERGE] Support native shared libs
Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.

Test: CTS tests in this topic

bug:62720360

Change-Id: I0a398593ebe41b2976cb706ca8a388005f5aec83
2017-06-20 12:12:34 -07:00
Philip P. Moltmann
9ae186e577 Merge "Correct lastId on onCreate with unexpected state" into oc-dev am: aed0c10d52
am: fd5c4dd477

Change-Id: Iae8f67a95e708d53a57c0e5f443c7387670e5721
2017-06-20 15:55:46 +00:00
Philip P. Moltmann
fd5c4dd477 Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am: aed0c10d52

Change-Id: I2197920ee7d6483276473129e74fd9527162dc0a
2017-06-20 15:48:54 +00:00