Commit Graph

11508 Commits

Author SHA1 Message Date
Bryce Lee
f9403a6fa1 Merge "Add aborted start result." into oc-dev am: 8796c20dae am: 943794bb70
am: ee289616fb

Change-Id: I1b69a9fb813e2cab1a3c8b496ea5b753cdf3abe6
2017-06-27 04:31:39 +00: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
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
Jeff Sharkey
adcd1fe0f6 Merge "Progress towards FBE and adoptable storage." 2017-06-26 17:41:47 +00: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
TreeHugger Robot
e59243772a Merge "Fix bug in reporting SwapPss in dumpsys meminfo." 2017-06-26 06:36:36 +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
Jeff Sharkey
a65e6491e4 Progress towards FBE and adoptable storage.
Offer to adopt storage devices on FBE devices, but keep it guarded
behind a system property for now, since we still need to work out key
storage details.

Verify that all users are unlocked before moving apps or shared
storage.  We only need them to be unlocked; we don't need them to
be actually running.

Have PackageManager dump the set of volumes that it's finished
scanning and loading, since otherwise CTS can get excited and race
too far ahead of it.  Add a specific error code to communicate
that users are locked.

Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 37436961, 29923055, 25861755, 30230655
Change-Id: I749dc3d8148e1a95d8bc4be56665253ef826d3fe
2017-06-23 16:35:15 -06:00
Ying Xu
12148fa980 Merge "Add flag to wipe eUICC data" into oc-dr1-dev am: 05ce703c87
am: a465181691

Change-Id: I8a54d9ab00223155e473b7ea4683a48def627288
2017-06-23 21:14:22 +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
Richard Uhler
91702eb391 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-23 16:54:25 +01:00
TreeHugger Robot
360eea897f Merge "Remove 'unused' import" 2017-06-23 15:10:12 +00:00
Benjamin Franz
482bb2343f Remove 'unused' import
Unused import android.provider.Settings previously caused checkstyle
script to bark on DevicePolicyManager. Remove the import and update all
usages of it in javadocs.

Bug: 37890361
Test: make docs
Change-Id: I3134d97274b2882060f5172170517ce501d5aafd
2017-06-23 13:49:36 +01: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
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
TreeHugger Robot
abc6fd57de Merge "Stop loading other package's font by default." 2017-06-22 22:28:10 +00:00
Neil Fuller
0e7dd105d8 Merge "Fix code and test related to rules version check" am: a3579d4b84 am: c506ade205 am: af32c3d234
am: 9b28a61fcf

Change-Id: Ia0e1e74364b9a72d9ec4e7058313c2c26f71d206
2017-06-22 22:14:18 +00: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
TreeHugger Robot
1c0e40d26c Merge "Add API to allow apps more control over instantiation" 2017-06-22 16:57:33 +00:00
Seigo Nonaka
6d6cd68660 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
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
2017-06-22 08:36:03 -07:00
Svetoslav Ganov
b0297aeb96 Merge "Support native shared libs" into oc-dr1-dev am: 77dea6284a
am: a6465a13cf

Change-Id: I95dbdad3eb12ea536b59134e86f4060fb35b3278
2017-06-21 17:47:44 +00: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
d24b6e3389 Merge "Merge "Small doc fix." into oc-dev am: 0f98ddaa01 am: e06356904f" into oc-dr1-dev-plus-aosp
am: 228853b223

Change-Id: Id09849da953b037dea07af819a1f4452453591da
2017-06-21 03:22:47 +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
Christopher Tate
924afe2b0f Add 'bmgr' command to synchronously init transports
bmgr init TRANSPORT [...]

will run an init operation on each named transport, blocking
until the operations have all completed.

Bug 62253989
Test: manual

Change-Id: I7dbd94293738d5ecf195764f5b28905253819791
2017-06-20 13:28:56 -07: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
Philip P. Moltmann
d1942b3abe Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am: aed0c10d52

Change-Id: I821aba22236152a8a0230a0db7a3710ad7731d12
2017-06-20 15:48:50 +00:00
Philip P. Moltmann
aed0c10d52 Merge "Correct lastId on onCreate with unexpected state" into oc-dev 2017-06-20 15:42:17 +00:00
Adam Lesinski
3daa24ac14 Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384 am: 185285592f
am: 4c07134a32

Change-Id: I425a1f59b1f08cee1afaa5f5ba1394deb6bb3b23
2017-06-20 01:23:49 +00:00
Adam Lesinski
4c07134a32 Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384
am: 185285592f

Change-Id: I080662459cbf6eeca9c4d6e4e80459efcbf83258
2017-06-20 01:17:49 +00:00
Adam Lesinski
cfedad3c2f Merge "Fix potential race in Theme creation" into oc-dev
am: b0a5fd0384

Change-Id: I9044d46d68f7fcb471f584d75225137c3b6f171b
2017-06-20 01:11:20 +00:00
Adam Lesinski
185285592f Merge "Fix potential race in Theme creation" into oc-dev
am: b0a5fd0384

Change-Id: I964d23b0daad2326989ece5f8ffc086b6286cb44
2017-06-20 01:11:19 +00:00
Adam Lesinski
b0a5fd0384 Merge "Fix potential race in Theme creation" into oc-dev 2017-06-20 01:07:11 +00:00
Felipe Leme
d10a1a372f Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065 am: b7e80c9350
am: 26474a4043

Change-Id: I7180414c0296c45852c63710021d8edc8ee11e83
2017-06-20 00:48:15 +00:00