Commit Graph

5830 Commits

Author SHA1 Message Date
Tenghui Zhu
cd2d38d65e Merge "Update the annotation for getAnimation" 2017-07-13 16:46:35 +00:00
ztenghui
b529256264 Update the annotation for getAnimation
b/63584307
Test: None
Change-Id: If0581ec3302956735bc4cc549a70c5a5ab9b4e2a
2017-07-12 16:08:40 -07:00
TreeHugger Robot
547964fc43 Merge "SystemServer: Support for LowpanService" 2017-07-10 20:20:18 +00:00
Tor Norbye
2b8286d218 Merge "Add COMPANION_DEVICE_SERVICE to @ServiceName" 2017-07-10 19:43:12 +00:00
Robert Quattlebaum
87a7104ae9 SystemServer: Support for LowpanService
The LowpanService implementation can be found at:

    platform/frameworks/opt/net/lowpan/service

Bug: b/33073713
Change-Id: Ibca9c452492bf171bd2c30efdb44ddb472494c3b
2017-07-10 10:16:43 -07:00
TreeHugger Robot
b2f9ab3347 Merge "Allow splits to declare a classloader type." 2017-07-10 15:01:52 +00:00
Bryce Lee
76f4782227 Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev am: 649053810f
am: 31bf99946c

Change-Id: I502d823cb4f9089a1c460d8a810381fef7333b2d
2017-07-10 14:37:56 +00:00
Bryce Lee
649053810f Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev 2017-07-10 14:21:37 +00:00
Tor Norbye
8246c07fa2 Add COMPANION_DEVICE_SERVICE to @ServiceName
This constant is now supported by Context#getSystemService
but was not added to the @ServiceName typedef.

Test: Manual (after metadata update in the tools, checked
code completion for getSystemService() call)

Change-Id: If1916726b57c8f187ecc8401dd7fafaa9ba216d0
2017-07-07 10:21:09 -07:00
Adam Lesinski
4eb4129c29 Fix Configuration#updateFrom() when assetsSeq doesn't change
Compare the value of assetsSeq when updating Configuration from
a delta.

Bug: 63352177
Test: manual
Change-Id: I9e1205cd64c4a1e0192b7049c82d36d53fb4af36
(cherry picked from commit 2123c415bf)
2017-07-06 21:56:46 +00:00
TreeHugger Robot
fbfe2177da Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" 2017-07-06 21:50:54 +00:00
Adam Lesinski
2123c415bf Fix Configuration#updateFrom() when assetsSeq doesn't change
Compare the value of assetsSeq when updating Configuration from
a delta.

Bug: 63352177
Test: manual
Change-Id: I9e1205cd64c4a1e0192b7049c82d36d53fb4af36
2017-07-06 12:06:13 -07:00
Bryce Lee
c5fe0eedb6 Add app bounds to Configuration#compareTo.
This CL takes app bounds into consideration when comparing two
Configurations with compareTo.

Change-Id: I9894f312429626975a2651b837cae8d80548c271
Fixes: 63160229
Test: go/wm-smoke
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests#testConfigurationCompareTo
2017-07-06 08:03:28 -07:00
Narayan Kamath
f9419f0f85 Allow splits to declare a classloader type.
Add an attribute android:classLoader which can be set to the name
of the classloader the base or split wishes to use. For now, this can
only be set to "dalvik.system.PathClassLoader" or
"dalvik.system.DelegateLastClassLoader". The current implementation
only allows the classloader to exist in the boot classpath but that
restriction can be loosened in a future change if necessary.

Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
Bug: 36044779

Change-Id: I5a51f7aa0c8c4c398d2f46129eb06785cc8e3c3f
2017-07-06 11:57:36 +01:00
Philip P. Moltmann
eb0a0ae7ae Expose TestApi needed by PermissionTests
Test: No code change
Bug: 32898128
Change-Id: Iab5a20e253d34bdd763aef82db5aad15f4ccff31
2017-06-30 13:15:19 -07:00
Bryce Lee
bb7965ed90 Merge "Add rotation to configuration." into oc-dr1-dev am: 2050dc66e2
am: 2004fc1387

Change-Id: If3a3975a2e07a96de1120b1a0744eab466284764
2017-06-30 16:40:58 +00:00
Bryce Lee
c1f2f2a9d3 Add rotation to configuration.
Certain activities are dependent on the rotation of the device to
determine layout. In these cases, orientation does not provide enough
details.

This CL adds the field (hidden) to the configuration.

Change-Id: Idb3ba10cb4de8838737c25e92264e6cee224e264
Fixes: 32839232
Test: go/wm-smoke
2017-06-29 17:40:23 -07:00
chaviw
59b9885bc8 Added Activity flags to show on lock screen.
Added two new flags to the Activity to turn the screen on and
show on the lock screen. These can be used instead of the Window flags
LayouParams.FLAG_TURN_SCREEN_ON and LayoutParams.FLAG_SHOW_WHEN_LOCKED
to prevent the double onStart/onResume lifecycle events.

The flags can be set as an attr for the Activity in the AndroidManifest
using android:showWhenLocked="true" and android:turnScreenOn="true".
They can also be set through methods in the Activity class using
setShowWhenLocked(true) and setTurnScreen(true).

Fixes: 36850100
Test: Created sample application, tests/ShowWhenLockedApp, that set the
      flags in the manifest and code. Tested multiple scenarios to
      launch the Activity with the flags set and unset.
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTransitionTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.ActivityManagerActivityVisibilityTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTests

Change-Id: I44f0e313df4531d49c7ac56108b6bf80e41fefc1
2017-06-29 13:33:43 -07:00
Lei Yu
32fcad6b29 Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev am: a023184bbc
am: eba86e5147

Change-Id: I537c1fd6b4fbf3e00269c50aebb23e9fd7fa3ad6
2017-06-28 18:13:02 +00:00
Lei Yu
a023184bbc Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev 2017-06-28 17:55:04 +00:00
TreeHugger Robot
26426a7f64 Merge changes Ie5c878d3,I33d9be04
* changes:
  Remove forward-lock install tests
  Use PackageInstaller
2017-06-27 19:50:42 +00:00
Makoto Onuki
11e9ed87f7 Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: eb63919bc4
am: 9b723d886e

Change-Id: If824cafb12f37555fc433512d1fd02ab107f4355
2017-06-27 00:35:31 +00:00
TreeHugger Robot
c4ccefc7fd Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev 2017-06-26 23:49:07 +00:00
Makoto Onuki
eb63919bc4 Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b

Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
2017-06-26 23:31:59 +00:00
jackqdyulei
a90bfb5f80 Add API to RuntimePermissionPresenter
Add API to reovke runtime permission in RuntimePermissionPresenter

Bug: 36921532
Test: runtest -x LocationCheckActionTest(in settings)
Change-Id: I51d43d6372fffcd260d7053cb89f2a00d3b07468
2017-06-26 13:44:10 -07:00
Jeff Sharkey
adcd1fe0f6 Merge "Progress towards FBE and adoptable storage." 2017-06-26 17:41:47 +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
Makoto Onuki
8f2a478d9d Fix activity icon badging for non-bitmap icons
Bug 62930145
Test: Manual test with development/samples/ShortcutDemo/launcher/

Change-Id: I8d0eed2e1f93a3b04a6a078c25cefbfc47c528a4
2017-06-23 13:10:41 -07:00
Makoto Onuki
fb2d50e891 Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed
Bug 38428650
Test: Manual test on an eng build + logcat + contacts app

Change-Id: I1b6c99b8f42443511baddd8574955a17342b2ac9
(cherry picked from commit 7d1911f264)
2017-06-23 17:52:10 +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
Tomasz Wasilczyk
25f69f7968 Merge "Rename Broadcast Radio service to avoid confusion with GSM radio." 2017-06-22 23:07:51 +00:00
TreeHugger Robot
abc6fd57de Merge "Stop loading other package's font by default." 2017-06-22 22:28:10 +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
Tomasz Wasilczyk
9110df7bf5 Rename Broadcast Radio service to avoid confusion with GSM radio.
Bug: b/36863239
Test: instrumentalization
Change-Id: I6f6ab7353e8db81b04ffd3cd9d65bfe9a32f4628
2017-06-22 07:57:20 -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
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
Svetoslav Ganov
324c41ba89 Merge "[DO NOT MERGE] Support native shared libs" into oc-dev 2017-06-21 01:06:22 +00:00
Romain Guy
f979298b48 Merge "Only enable wide color gamut support on capable devices" into oc-dr1-dev am: 8d4ff1b34f
am: b11cf2d2e5

Change-Id: I6a8fe23b0c1c81142611fe5b0867b8d7f04a4e9b
2017-06-21 00:00:56 +00:00
TreeHugger Robot
8d4ff1b34f Merge "Only enable wide color gamut support on capable devices" into oc-dr1-dev 2017-06-20 23:41:39 +00:00
Romain Guy
e89d0bba66 Only enable wide color gamut support on capable devices
Bug: 62827458
Test: CtsColorModeTests, more tests going in MR1
Change-Id: Idca2804b04ae6bdcbec6bcda6fd74dc6ada89c31
2017-06-20 14:23:28 -07:00
Makoto Onuki
fc55d338ae Merge "Enhance recent sync log in dumpsys content" into oc-dr1-dev am: a014ce292a
am: cfa771ef01

Change-Id: Ie6a02be9d11bbb3b3f58696261b4c1277d30c5fa
2017-06-20 19:36:44 +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
Makoto Onuki
15e7a256e1 Enhance recent sync log in dumpsys content
- Add "Per Adapter History" section that has recent activities per adapter. Example:
  mxxxx@gmail.com/com.google u0 [com.android.calendar]
    2017-06-19 14:19:07 success Source=LOCAL Elapsed=0s Reason=10014 Extras=[upload=true ]
    2017-06-19 14:19:06 success Source=SERVER Elapsed=16s Reason=10014 Extras=[feed=#contacts@group.v.calendar.google.com ]
  mxxxx@gmail.com/com.google u0 [com.android.chrome]
    2017-06-19 13:26:25 canceled Source=POLL Elapsed=0s Reason=AccountsUpdated Extras=[initialize=true ]
  mxxxx@gmail.com/com.google u0 [com.android.contacts]

- Improve pending/periodic syncs with better formatting, and sort them in a sane order.

Bug: 38498544
Bug: 62391411
Test: manual test with "dumpsys content"
Change-Id: I947a9255230f27a7f438d648da324787fdf16f55
2017-06-20 17:14:06 +00:00
Todd Kennedy
cda831fcd5 Use PackageInstaller
stop using internal, deprecated installPackage / deletePackage directly
on the package manager. instead, go through the package installer.

Bug: 38197362
Test: bit FrameworksCoreTests:android.content.pm.PackageManagerTests
Change-Id: I33d9be042628c344f33d474a39385ca34925bf46
2017-06-20 09:27:46 -07:00
Phil Weaver
be16a207b4 Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 8b2816faa3" into oc-dr1-dev-plus-aosp
am: e9bd6e72fc

Change-Id: I534fb195d21490663e299c39d4a64b63856d7935
2017-06-17 01:26:53 +00:00
Phil Weaver
09e5b54fd5 Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9
am: 8b2816faa3

Change-Id: I567471d68e6ad5b60fcf33eda47e5d99bdb49f2b
2017-06-17 01:05:36 +00:00
Phil Weaver
0da21f56e4 Merge "Separate a11y and autofill view ids" into oc-dev
am: c91290a6e9

Change-Id: Iec71a9ae34f963ef1f0ce7f6bd09b5af5bbba6e6
2017-06-17 00:59:04 +00:00
Phil Weaver
8b2816faa3 Merge "Separate a11y and autofill view ids" into oc-dev
am: c91290a6e9

Change-Id: Ib4566c2f0e32477d5f9eb6510edc140c2b66e0a4
2017-06-17 00:56:19 +00:00
Phil Weaver
846cda9397 Separate a11y and autofill view ids
Autofill seems to need IDs to be preserved across things
like configuration changes, while accessibility will not
function without views with unique ids. Separating out the
two types of IDs. We can re-combine them once it's clear
that both demands can be satisfied.

Bug: 62301218
Test: Run a11y and autofill CTS, and verify that the play
store app functions with TalkBack after a screen rotation.

Change-Id: I17a99de2874768fc0ade3aa354130dd1f6b4cd7e
2017-06-16 14:36:36 -07:00