Commit Graph

64690 Commits

Author SHA1 Message Date
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
Adrian Roos
ccf4033aad Merge "AmbientDisplay: Add always on prototype" 2016-10-31 23:51:02 +00:00
Adrian Roos
ebea7a7e56 AmbientDisplay: Add always on prototype
Test: adb shell settings put secure doze_always_on 1
Change-Id: I3f293b3ef43847b7848af416b44f212fc40514d4
2016-10-31 14:49:52 -07:00
Winson Chung
655332c641 Creating PinnedStackController.
- Creating a PinnedStackController to keep track of the state of the PIP
  to prevent changes in the system (ie. IME showing) and user interaction
  from clobbering each other.
- Refactoring calls in AM into WM/controller

Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ie59dfd45d5c54764ba69a589b3b8148845e92cc3
Signed-off-by: Winson Chung <winsonc@google.com>
2016-10-31 13:21:55 -07:00
Makoto Onuki
4b3c306268 Merge "Add @NonNull / @Nullable to DPM return types" 2016-10-31 20:15:10 +00:00
Chad Brubaker
006b53a681 Merge "Add ephemeral protection level" 2016-10-31 20:02:53 +00:00
Rob Carr
293a00c98b Merge "Allow specifying rotation animation in manifest." 2016-10-31 19:39:44 +00:00
Sanket Agarwal
1a845e3637 Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18 am: 9e33f453a3
am: 502e3e53ec

Change-Id: I8211babdceb7228c74232c15dfbc51d9f771d674
2016-10-31 19:36:53 +00:00
Chet Haase
281c3a28be Merge "Clean up InputConnection.commitContent() javadocs" 2016-10-31 19:34:51 +00:00
Sanket Agarwal
502e3e53ec Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
am: 9e33f453a3

Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
2016-10-31 19:29:56 +00:00
Sanket Agarwal
9e33f453a3 Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
am: 50cc13cc18

Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
2016-10-31 19:25:34 +00:00
Sanket Agarwal
50cc13cc18 Merge "Configuration for priority/auto-connection for PAN."
am: ba63f32ed5

Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
2016-10-31 19:19:30 +00:00
Yorke Lee
fed503cb46 Merge "Add new methods to ITaskStackListener" 2016-10-31 19:05:03 +00:00
Marie Janssen
635d528877 resolve merge conflicts of 6a31a5c to stage-aosp-master
am: 879a5169ec

Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
2016-10-31 18:47:52 +00:00
Makoto Onuki
408e8e4491 Add @NonNull / @Nullable to DPM return types
Fix: 31331663
Fix: 32466757

Test: Signature change only; checkbuild.
Change-Id: I361cdd43b9fccf309ff3efefa3783d5399e65748
2016-10-31 11:29:28 -07: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
Marie Janssen
879a5169ec resolve merge conflicts of 6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
2016-10-31 11:00:06 -07:00
Sanket Agarwal
773297a83e Configuration for priority/auto-connection for PAN.
We protect the auto-connection via a flag so that it is only enabled on
some devices.

Bug: b/30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit 1f09d5f255980488cabd55a5c44a5737e24541d8)
2016-10-31 17:45:32 +00:00
Stephen Chen
26b0c6ae69 Merge "Define API for metering network stats buckets." 2016-10-31 17:22:12 +00:00
Steve McKay
0fbdbce598 Merge "Remove the EXTRA_FANCY_FEATURES flag..." 2016-10-31 17:12:35 +00:00
Marie Janssen
6a383a7d32 Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.

Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.

Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble

Bug: 32140251
Bug: 32140271
Bug: 32369494

Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
2016-10-31 09:06:36 -07:00
Chet Haase
2a16fc53e2 Clean up InputConnection.commitContent() javadocs
Test: docs only, no test apart from verifying that it builds
Bug: #32158219 clean up InputConnection.commitContent() javadocs
Change-Id: I94ca33a34dfaece8db912367d2290db67a4a038a
2016-10-31 09:00:20 -07:00
Aga Madurska
99449eea6c Update colors for the round scroll bar. am: 5177264735 am: c78b695126
am: 5a5187edcd

Change-Id: I08861d4c80ba2d682ed009c82bec1933d8f78c09
2016-10-31 12:05:28 +00:00
Aga Madurska
5a5187edcd Update colors for the round scroll bar. am: 5177264735
am: c78b695126

Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
2016-10-31 11:59:29 +00:00
Nicolas Prévot
7e0c4521f9 Merge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set." 2016-10-31 11:23:27 +00:00
Aga Madurska
5177264735 Update colors for the round scroll bar.
Bug:32536003

Change-Id: I35503c089bc918493aab3288580f81d7b780d671
2016-10-31 10:55:07 +00:00
Tomasz Mikolajewski
7182514d8b Merge "Add support for opening JAR/ZIP files via FD." 2016-10-31 05:55:54 +00:00
TreeHugger Robot
37c20a369c Merge "Iteration on findPath API. Address Jeff's comment in ag/1542773." 2016-10-29 01:36:16 +00:00
Steve McKay
e5a8a17ed2 Remove the EXTRA_FANCY_FEATURES flag...
Which is no-longer necessary.

Test: build and run.

Change-Id: I515c4a1bf78cbf4d54304bf4ebe1059a596c95a0
2016-10-28 16:55:27 -07:00
Dianne Hackborn
d409b78728 Merge "Power manager now prevents wake locks from idle uids." 2016-10-28 23:53:34 +00:00
TreeHugger Robot
27e9c97803 Merge "Add FragmentLifecycleCallbacks" 2016-10-28 23:53:21 +00:00
Garfield Tan
5f2148077a Iteration on findPath API. Address Jeff's comment in ag/1542773.
* Add @Nullable to rootId in Path constructor.
* Erase rootId if findPath() doesn't return null rootId.
* Use Log.wtf() instead of throwing.

Bug: 30948740
Change-Id: I38354c5ac49aaa7e31a3ae56cd3379ffb19918c9
(Cherry picked from commit 04fdf6e18c97c2bf6ed58f8de9ba6723fa8c1613)
2016-10-28 23:49:35 +00:00
Adam Powell
38c67ff93b Add FragmentLifecycleCallbacks
Add a new callback object that can be attached to a FragmentManager to
observe all fragment lifecycle events within that
FragmentManager. Useful for dependency injection and other
shenanigans.

FragmentLifecycleCallbacks can be registered as recursive, in which
case they will be activated for any lifecycle events that happen in
descendant FragmentManagers as well.

Test: cts-tradefed run singleCommand cts --skip-preconditions --skip-device-info --module CtsFragmentTestCases
Change-Id: I816b1fbef6c29616ccc3fd729ee847c5f1a6f72f
2016-10-28 14:59:54 -07:00
Yorke Lee
bd54c2aab6 Add new methods to ITaskStackListener
Refactor task change notification logic into a separate class
TaskChangeNotificationController.

Add ActivityManagerService.unregisterTaskStackChangedListener

Add a no-op implementation that clients can subclass to avoid
having to reimplement all new methods when they are added.

Add new methods:
onTaskAdded
onTaskRemoved
onTaskMovedToFront
onTaskDescriptionChanged
onActivityRequestedOrientationChanged
onTaskFinishing

Design doc:
https://docs.google.com/document/d/1IgWZ44rKe9k1CzkjP2Mohv12OgRD1FxH8oLAyzhvCY4/edit#heading=h.yhzl6os0dbo5

Cherry-picked from I8302d6d3baf1ac1ca928765fe203091b9fab4070

Bug: 32277482
Test: Verify that callbacks are called in dummy implementations

Change-Id: I2ac2b870147ef049f3ee05fc5916c99332334526
2016-10-28 14:58:19 -07:00
Sanket Agarwal
6b2b2a87f9 Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd
am: 9527a19cbc

Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
2016-10-28 20:28:50 +00:00
Sanket Agarwal
9527a19cbc Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533
am: 958dab93cd

Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
2016-10-28 20:19:14 +00:00
Sanket Agarwal
958dab93cd Merge "Use UUIDs for call management in Headset Client (HF)"
am: 678ba24533

Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
2016-10-28 20:13:57 +00:00
John Reck
1952e2dc9b Merge "Add SurfaceHolder#lockHardwareCanvas()" 2016-10-28 19:38:45 +00:00
Nicolas Prevot
df1b87db5d Allow DO to remove user even if DISALLOW_REMOVE_USER is set.
BUG:32300784
Test: create user in TestDPC, set DISALLOW_REMOVE_USER restriction,
and remove this user.
Change-Id: I96ab02d594cd1a8ab14420e12357f2083da1ce63
2016-10-28 19:25:31 +01:00
Dianne Hackborn
d33c7cd87a Power manager now prevents wake locks from idle uids.
The activity manager now pushes the idle/active state
down in to the power manager.  The power manager now
tracks a structure of data about each uid: how many
wake locks it holds, whether it is active, and (as before)
its current process state.

Now when apps are inactive, we always disable wake locks
they hold, regardless of the system's device idle or
other state.

Test: none

Change-Id: I2cd4077e4d8a8572525406ae9747f0a2435764da
2016-10-28 11:20:19 -07:00
Sanket Agarwal
52a04e4467 Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit 40bb6f3f8f)
2016-10-28 18:16:53 +00:00
Jakub Pawlowski
d649849928 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 am: 61d0088923
am: e582ab854d

Change-Id: Ibbf57cfccad50ae5d7dd9f80a13f08c5cfd1623e
2016-10-28 03:24:38 +00:00
Jakub Pawlowski
e582ab854d Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6
am: 61d0088923

Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
2016-10-28 03:01:56 +00:00
Jakub Pawlowski
61d0088923 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21
am: 81d5ecb7a6

Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
2016-10-28 02:56:54 +00:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)"
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
2016-10-28 02:50:54 +00:00
Tomasz Mikolajewski
5a5c44a2e3 Add support for opening JAR/ZIP files via FD.
Test: Upcoming change in DocumentsUI uses this feature.
Bug: 31783726
Change-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e
2016-10-28 11:23:20 +09:00
TreeHugger Robot
42875e6cf6 Merge "Perform onDestroy when FragmentController is torn down." 2016-10-28 00:52:32 +00:00
TreeHugger Robot
9212fc742f Merge "Correctly use ByteBuffer in UsbRequest" 2016-10-27 23:47:32 +00:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
2016-10-27 23:09:35 +00:00
Svetoslav Ganov
f9e2ad0b3c Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f)
2016-10-27 22:49:11 +00:00