Commit Graph

4773 Commits

Author SHA1 Message Date
Etan Cohen
3a1dd86ce4 Merge "[NAN-AWARE] Rename NAN to Aware" 2016-11-05 16:19:43 +00:00
Etan Cohen
0413327d74 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569)
(cherry-pick of commit b061f21e7e59a99834e163e2baa1c82229e419a6)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
2016-11-04 15:42:08 -07:00
TreeHugger Robot
3e8431f1f2 Merge "Move IActivityManager to aidl." 2016-11-04 22:24:12 +00:00
Chad Brubaker
cbc59b8aa6 Merge "Move ephemeral apps into the ephemeral SELinux domain" 2016-11-04 21:46:16 +00:00
Sudheer Shanka
fc46e9b643 Move IActivityManager to aidl.
Bug: 30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: I9cf81c4d381ebce14a6c701e409cbb269f2ff1fb
2016-11-04 10:43:25 -07:00
Garfield Tan
0b3cf666d0 Unhide findPath() API. Add JavaDoc to related features.
Also remove comments that disallow folders in search results.

Test: It builds.

Bug: 30948740
Bug: 32512923
Change-Id: I72706b69163aa98ee9568939e09e5048b6e8f9f8
2016-11-03 15:42:18 -07:00
TreeHugger Robot
02e17d27b1 Merge "[DPM] Management and retrieval of network logs" 2016-11-02 23:28:10 +00:00
Fyodor Kupolov
3c17728297 Merge "Reuse single AssetManager for lite/full parses" 2016-11-02 16:57:04 +00:00
Tony Mak
d3986be5e4 Add javadoc for profileGroupId
According to the implementation of getProfileParent,
profileGroupId == parent user id.

And we have already assumed this is true in some part of code in DPMS.

Test: Javadocs change

Change-Id: Ie48fdf24fb0428d4ee3f09bed2ac26cb17e1ced9
2016-11-02 10:18:01 +00:00
Michal Karpinski
f77ee4f1b7 [DPM] Management and retrieval of network logs
This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2
2016-11-02 09:00:21 +00:00
Fyodor Kupolov
965fa697c9 Reuse single AssetManager for lite/full parses
parseClusterPackage/parseMonolithicPackageLite now share a single instance
of AssetManager, avoiding loading resources twice.

Test: manual

Bug: 29273545
Bug: 30792387
Change-Id: I2209cf6f09886d444dc62993aace00c356718cdb
2016-11-01 11:36:56 -07:00
Chad Brubaker
006b53a681 Merge "Add ephemeral protection level" 2016-10-31 20:02:53 +00:00
Chad Brubaker
c19706a937 Add ephemeral protection level
Ephemeral applications will only be able to be granted permissions that
have the ephemeral proteciton level, this allows us to tighly define
what behavior is OK for ephemeral applications.

This includes an initial small whitelist of permissions for ephemeral
apps, it may be expanded later.

Test: adb install --ephemeral, verified against both runtime and install
time permissions
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: I854c44cf7a293d484b674cdd4fb5141e362a2f1a
2016-10-31 18:27:28 +00:00
Robert Carr
0f5d753972 Allow specifying rotation animation in manifest.
In the case where activity launching may trigger orientation
changes we may wish to run the rotation animation with a starting
window, in which case the app won't have had time to set the
rotation animation on the window yet, so we desire a way to
specify it for the whole activity.

Test: Run RotationAnimation activity from API Demos and verify default animation is crossfade
Bug: 29940147
Change-Id: I5deae6c6a32ee51a0a5409d38f0e5d15ca464a1b
2016-10-27 22:08:11 +00:00
Kevin Hufnagle
b881803ef2 docs: Updated ShortcutManager and ShortcutInfo class references. am: 68d699d100 am: 38138600d2
am: cc93c4d247

Change-Id: Idc65cf4ce396728840a81893b2e078af6152cddc
2016-10-20 00:10:41 +00:00
Kevin Hufnagle
cc93c4d247 docs: Updated ShortcutManager and ShortcutInfo class references. am: 68d699d100
am: 38138600d2

Change-Id: I5545ca14cebb7ff1d38f03d329c3a0dd1f329390
2016-10-20 00:02:14 +00:00
Kevin Hufnagle
68d699d100 docs: Updated ShortcutManager and ShortcutInfo class references.
Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
2016-10-18 15:53:09 -07:00
Ben Lin
145b0cad42 Adding an Extra field for Intents so chooser show up even if one app.
By design, ChooserActivity (the activity that shows up when there's an
intent sent that can be handled by multiple apps) always default to not
show if there's only one app available to choose from. This adds the
extra in Intent such that if passed in, the parent activity can choose
to override the behavior and force show the chooser even if there's only
one app. Default is still skipping the chooser.

Bug: 31830662
Change-Id: I17d676e77094cded4af99c7433f511e8c6c58164
(cherry picked from commit 2c5adbdf1942898baa97a3c8a7976fc7c0627902)
2016-10-17 11:32:39 +00:00
Andrii Kulian
a8a9bc5860 Make usage of Configuration.EMPTY safe
With current approach there is a high chance of making a programming
error and altering the state of singleton Configuration.EMPTY object,
because previously configuration was usually set by link to it.

This CL changes the behavior to create Configuration member objects
only once and alter their state afterwards.

Test: Manual and existing tests still pass.
Change-Id: Ie267c2fbf555f137670b7bd2cd251b817c69bc8e
2016-10-14 11:00:13 -07:00
Wale Ogunwale
df241e9771 Allow home activity to be resizeable if it explicitly wants to be.
We previously didn't allow home activities to be resizeable due to not fully
understanding how the UX would work. We now have a better idea of how the UX will
work. However, since this is a behavior change for home activities we require them
to explicitly say they want to be resizeable vs. the framework assuming they can
be resizeable based on their target sdk.

Bug: 30982291
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
Change-Id: I41aefc8c3b3da4c2cf66be81835222196df3ef26
2016-10-14 07:12:31 -07:00
Wale Ogunwale
72a73e3473 Track making activity resizeable based on sdk version separately.
To support resizeable home activities we need to make the home activity
resizeable only when the app explicitly says it is resizeable. To be able
to do that we need to track if we are allowing the app to be resizeable
due to the sdk version it is targetting separately from it explicitly
setting it so that activity manager and window manager can make the right
choices in a follow-up CL.

Bug: 30982291
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
Change-Id: I10f53ee9e57a41a3edece91cf68c5e8ef4bf4489
2016-10-14 07:11:20 -07:00
Wale Ogunwale
3eadad7566 Removed ActivityInfo.RESIZE_MODE_CROP_WINDOWS and related code.
The 2-finger gesture feature which this code is used for never
shipped and was removed from the code base.

Test: Existing tests pass.
Change-Id: I1540c8729fe87fef8e39b41747438557a8da2fa6
2016-10-14 07:05:57 -07:00
Dianne Hackborn
8888aedc1f Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7 am: 9774ea3646
am: 50468217c4

Change-Id: I949e6337546835a0673b85ee6e2ad67fb0a0fec4
2016-10-13 20:44:47 +00:00
Dianne Hackborn
50468217c4 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
2016-10-13 20:38:04 +00:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
2016-10-12 18:17:58 -07:00
Chet Haase
5cde9305e4 Fix small typo in ShortcutManager header docs am: c158431f8e am: 5aa0dfcc0a
am: 3267a2462d

Change-Id: I9417c0a15bbc2125dd0c370bc09b2315706005f1
2016-10-12 00:43:30 +00:00
Chet Haase
3267a2462d Fix small typo in ShortcutManager header docs am: c158431f8e
am: 5aa0dfcc0a

Change-Id: Ia3a1a14cf561e6846245fa8265e96e954d8a185d
2016-10-12 00:31:31 +00:00
Chet Haase
c158431f8e Fix small typo in ShortcutManager header docs
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
2016-10-11 21:48:55 +00:00
Chad Brubaker
45abcf44c5 Move ephemeral apps into the ephemeral SELinux domain
This also removes AutoplayApp which was the previous (ununsed) N domain
and flag for ephemeral apps.
Test: Ephemeral apps now run in ephemeral_app
Change-Id: Ie339885c3996acbdcfe12452daa1d5edb3b93cda
2016-10-10 13:46:01 -07:00
John Reck
32995223a8 Convert utils fastjni -> @FastNative
Test: builds & boots, refactor no behavior change
Change-Id: Ieb569a70fd05b88a8d2bd7b285099c1fc1888a75
2016-10-10 07:59:25 -07:00
Nicolas Prévot
4fc56e2c10 Merge "Don't allow the shell to change admin-locked app permissions." 2016-10-06 13:36:11 +00:00
Robin Lee
f1ac71dbe2 Merge "Redact work notifications separately from personal" 2016-10-05 14:59:31 +00:00
Nicolas Prevot
700e1e7ee8 Don't allow the shell to change admin-locked app permissions.
BUG:27432532
Change-Id: I67f8794ea923edb5024033bb2a4474a1fb6d5fd9
2016-10-03 16:17:04 +01:00
Kevin Hufnagle
9c3cbe634c docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a am: ba65a92855
am: cf7a2e1efd

Change-Id: Ica7b4c4a6544a4b7f71ddb26dbc979b11abab81c
2016-09-27 06:50:25 +00:00
Kevin Hufnagle
e49b2ac9ee docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3 am: e0360165d3
am: ffafee82cd

Change-Id: I5a367c279f88f6046df67fd19312067984bb1edc
2016-09-27 06:46:02 +00:00
Kevin Hufnagle
5b4664b2de docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b am: 108623004f
am: 978be65ce7

Change-Id: Ib487f0b406faf94d32a67444a4068840301f03bd
2016-09-27 01:18:42 +00:00
Kevin Hufnagle
9dc7f07f26 docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59 am: 1fb3dec4be
am: 5ca3c61069

Change-Id: I4bc998a8b1848068d030b3c826189836de3c7375
2016-09-27 01:04:33 +00:00
Kevin Hufnagle
cf7a2e1efd docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a
am: ba65a92855

Change-Id: Ia3fc2e6cfc85269a04a721d7c6fe14e04555a121
2016-09-27 00:03:58 +00:00
Kevin Hufnagle
e83639f66a docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a
am: 2e8026acc0

Change-Id: I93a1abe6b80a441f8c441390dacbff2824d52e57
2016-09-27 00:02:44 +00:00
Kevin Hufnagle
ffafee82cd docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3
am: e0360165d3

Change-Id: I02e413c1dbf2cfe684a0b73aafd7075b4db4c090
2016-09-27 00:02:16 +00:00
Kevin Hufnagle
abfc0340d7 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3
am: 9402b319fe

Change-Id: Id7d4b705073802abcb2d902b50673a09933ff3da
2016-09-27 00:01:00 +00:00
Kevin Hufnagle
2e8026acc0 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB.
am: e9681e192a

Change-Id: Ide8f3c2dd5414737c798c20c1fe9f11dcd9640ce
2016-09-26 23:36:25 +00:00
Kevin Hufnagle
ba65a92855 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB.
am: e9681e192a

Change-Id: I4d84c62b039746cd70c74a0bc9edbffc6df3a44c
2016-09-26 23:35:11 +00:00
Kevin Hufnagle
9402b319fe docs: Removed all instances of "i.e." in IntentFilter parameter descriptions.
am: e20b3d78e3

Change-Id: I8d677ebcf03c28f46874514408240162cd6331c5
2016-09-26 23:34:58 +00:00
Kevin Hufnagle
e0360165d3 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions.
am: e20b3d78e3

Change-Id: I37821ca96243491cf642a58475dd96e5e7b52962
2016-09-26 23:33:43 +00:00
Kevin Hufnagle
978be65ce7 docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b
am: 108623004f

Change-Id: I7efbc417f5cd7ebfa8a6e19d110a742a22bdd465
2016-09-26 23:17:11 +00:00
Kevin Hufnagle
ee3fc61cf9 docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b
am: 2c885fc5ea

Change-Id: I1d94ee6938726736d6cbccafea848dd6f3d6a350
2016-09-26 23:16:02 +00:00
Kevin Hufnagle
2c885fc5ea docs: Fixed example of ACTION_VIEW intent
am: aedfd75b1b

Change-Id: Iaaaa1cb0f6d796ad5c5c178c70850fd83e635013
2016-09-26 23:00:51 +00:00
Kevin Hufnagle
bec2e99f95 docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59
am: d23fc43965

Change-Id: I27847f0935c047e74ab986c501fce160679a80d7
2016-09-26 23:00:16 +00:00
Kevin Hufnagle
108623004f docs: Fixed example of ACTION_VIEW intent
am: aedfd75b1b

Change-Id: I2ac1bd94b7cacc2b1aaed6caf2f7044db5a892c6
2016-09-26 22:59:37 +00:00