Commit Graph

294552 Commits

Author SHA1 Message Date
TreeHugger Robot
423af758c9 Merge "Introduced ReadOnlyWindowList" 2016-10-31 21:15:46 +00:00
Winson Chung
d946d91b94 Merge "Creating PinnedStackController." 2016-10-31 21:12:49 +00:00
TreeHugger Robot
e7cd5a36ec Merge "Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables." 2016-10-31 20:37:30 +00: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
TreeHugger Robot
1f0a6683c2 Merge "DeviceInfoUtils: support clang kernel version" 2016-10-31 20:19:33 +00: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
Wale Ogunwale
f7cab10b79 Introduced ReadOnlyWindowList
7th and Final step in making the modification of a display's
WindowList private to DisplayContent.
ReadOnlyWindowList provides an interface for external classes to
DisplayContent to access the window list without being able to
modify it. This will be important in upcoming CLs where it is
important for us to keep track of when the window list changes.

Bug: 30060889
Test: Manual testing and existing tests pass.

Change-Id: I4de0b258a40fd4b21ef9cc9e3401488f76d25f83
2016-10-31 12:28:13 -07: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
Sanket Agarwal
ba63f32ed5 Merge "Configuration for priority/auto-connection for PAN." 2016-10-31 19:08:54 +00:00
Yorke Lee
fed503cb46 Merge "Add new methods to ITaskStackListener" 2016-10-31 19:05:03 +00:00
Marie Janssen
22eb71b11d resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec am: 635d528877
am: 03836e31a9

Change-Id: Iefdedf47a91d398ca3c45656a4d73749acd03e6d
2016-10-31 19:00:50 +00:00
Marie Janssen
03836e31a9 resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec
am: 635d528877

Change-Id: I9a59aa4c657019ee06117591cb1a0bda4c67ea96
2016-10-31 18:54:23 +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
Nick Desaulniers
7091e2fdc0 DeviceInfoUtils: support clang kernel version
Test: view settings
Bug: 32455817
Change-Id: Iaaf8021fa743c74c8052b6a3352ef15b40cc4974
2016-10-31 11:35:08 -07: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
Stan Iliev
021693b967 Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables.
Implement SkiaRecordingCanvas, RenderNodeDrawable, GLFunctorDrawable,
LayerDrawable, StartReorderBarrierDrawable, EndReorderBarrierDrawable.
Move AnimatedRoundRect and AnimatedCircle in a separate file.
All Skia pipeline files are moved in hwui/pipeline/skia folder.
Add unit tests for RenderNodeDrawable, StartReorderBarrierDrawable,
EndReorderBarrierDrawable and SkiaRecordingCanvas.

Test: I tested manually on 6P devices and did run the unit tests.
Change-Id: If2a347bd1fc4689953822294ce5bf98c7f3f57c7
2016-10-31 14:27:02 -04: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
Brad Ebinger
0daded4046 Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484 am: 3030cd855b
am: 10f8f2e95c

Change-Id: I722b4e6c012b96612ede2c1d8a932a3da4773b45
2016-10-31 17:28:21 +00:00
Brad Ebinger
10f8f2e95c Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484
am: 3030cd855b

Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8
2016-10-31 17:22:46 +00:00
Stephen Chen
26b0c6ae69 Merge "Define API for metering network stats buckets." 2016-10-31 17:22:12 +00:00
Treehugger Robot
6a31a5c2dd Merge "Bluetooth: prevent enabling BLE in airplane mode" 2016-10-31 17:20:39 +00:00
Brad Ebinger
3030cd855b Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0
am: 9e4d4ee484

Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20
2016-10-31 17:17:57 +00:00
Steve McKay
0fbdbce598 Merge "Remove the EXTRA_FANCY_FEATURES flag..." 2016-10-31 17:12:35 +00:00
Brad Ebinger
9e4d4ee484 Merge "Modify AIDLs to include Session.Info"
am: 78a63c1cf0

Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
2016-10-31 17:12:26 +00:00
Brad Ebinger
78a63c1cf0 Merge "Modify AIDLs to include Session.Info" 2016-10-31 17:04:50 +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
Aga Madurska
c78b695126 Update colors for the round scroll bar.
am: 5177264735

Change-Id: I576d9149292cc23ac72a734d5ac3986d199f7db8
2016-10-31 11:53:51 +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
Lorenzo Colitti
7072f32b32 Merge changes from topic 'frameworks-net-tests'
* changes:
  Move the connectivity tests to frameworks/base/tests/net.
  De-guava BroadcastInterceptingContext and move it to testutils.
  Move FakeSettingsProvider to a common location.
2016-10-31 04:16:51 +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
TreeHugger Robot
fbee823e88 Merge "Add windows to window tokens in expected z-order" 2016-10-28 21:52:17 +00:00