vinodkrishnan
07351b6843
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4" into nyc-mr2-dev-plus-aosp
...
am: bd040ec4f9
2016-11-30 22:13:08 +00:00
vinodkrishnan
4801a81559
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4
...
am: bf5a4eb151
2016-11-30 22:10:01 +00:00
vinodkrishnan
4f8a7a5582
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: 60d4248fdc
...
am: 7e88808cd5
2016-11-30 22:06:52 +00:00
Android Build Merger (Role)
bd040ec4f9
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4" into nyc-mr2-dev-plus-aosp
2016-11-30 22:03:26 +00:00
vinodkrishnan
bf5a4eb151
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556
...
am: afd52a7ad4
2016-11-30 22:02:11 +00:00
vinodkrishnan
7e88808cd5
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556
...
am: 60d4248fdc
2016-11-30 22:01:52 +00:00
vinodkrishnan
afd52a7ad4
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
2016-11-30 21:52:13 +00:00
vinodkrishnan
60d4248fdc
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
2016-11-30 21:52:05 +00:00
TreeHugger Robot
91507e09ec
Merge "Deprecate eglCreatePixmapSurface"
2016-11-30 21:27:40 +00:00
Sergei Vasilinetc
c1e6a12ab5
Merge "Add createHardwareBitmap on GraphicBuffer for SysUI"
2016-11-30 20:53:43 +00:00
vinodkrishnan
7b62df8556
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
This reverts commit 8500f26d51
2016-11-30 20:09:59 +00:00
TreeHugger Robot
325fa50d8d
Merge "Allow setting managing organization for the device"
2016-11-30 19:25:33 +00:00
Fyodor Kupolov
fd4f73c76c
Merge "Support disabled/log/enforce in ro.control_privapp_permissions"
2016-11-30 18:50:11 +00:00
sergeyv
9a02987642
Add createHardwareBitmap on GraphicBuffer for SysUI
...
Test: none
bug:30999911
Change-Id: Ic396e25d9e587665e634c3192e14ef4bc3dc78f7
2016-11-30 10:47:12 -08:00
Chad Brubaker
d61cc80aca
Merge "Expose CAMERA and ACCESS_NETWORK_STATE to ephemeral apps"
2016-11-30 18:30:48 +00:00
Romain Guy
1f071dd8c3
Deprecate eglCreatePixmapSurface
...
This function was never properly supported. It had partial support in our JNI
layer in EGL10 but not implementation in EGL14. It has never been tested and
it is unlikely that drivers support pixmap rendering.
Bug: 11257511
2016-11-30 10:20:29 -08:00
Phil Weaver
702997bfb2
Merge "Don't invalidate list data during layout." into nyc-mr2-dev am: d1b7d3262b
...
am: 762cbc339a
2016-11-30 18:06:31 +00:00
Phil Weaver
7584b074ae
Don't invalidate list data during layout. am: a9d976f39a
...
am: 84a0d97b85
2016-11-30 18:05:26 +00:00
Phil Weaver
762cbc339a
Merge "Don't invalidate list data during layout." into nyc-mr2-dev
...
am: d1b7d3262b
2016-11-30 18:01:00 +00:00
Phil Weaver
84a0d97b85
Don't invalidate list data during layout.
...
am: a9d976f39a
2016-11-30 18:00:54 +00:00
Phil Weaver
d1b7d3262b
Merge "Don't invalidate list data during layout." into nyc-mr2-dev
2016-11-30 17:51:42 +00:00
Etan Cohen
ba4a81b363
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff am: 1c92763087
...
am: 1f5d3014c5
2016-11-30 17:30:23 +00:00
Bartosz Fabianowski
365a3db470
Allow setting managing organization for the device
...
The Profile Owner of a managed profile can set a string that will be
shown in the UI to identify the organization managing the profile.
This CL extends the functionality to the Device Owner of a managed
device.
Bug: 32692748
Test: DevicePolicyManagerTest unit test + CTS test in separate CL
Change-Id: I47295da2fd6485ebf0e890da13990a044accaf17
2016-11-30 18:28:10 +01:00
Etan Cohen
1f5d3014c5
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff
...
am: 1c92763087
2016-11-30 17:24:47 +00:00
Etan Cohen
1c92763087
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad
...
am: ad299d38ff
2016-11-30 17:14:14 +00:00
Etan Cohen
ad299d38ff
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
...
am: 47502919ad
2016-11-30 17:08:32 +00:00
Romain Guy
0f10b2f164
Merge "Add fallback case in glGetShaderInfoLog"
2016-11-30 17:05:37 +00:00
Etan Cohen
47502919ad
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
2016-11-30 16:58:08 +00:00
Matt Sarett
711b6aec9a
Merge "Add overdraw debugging feature to Skia pipelines"
2016-11-30 16:51:24 +00:00
Mahaver Chopra
ffbaf9a06e
Merge "Update java doc to reflect EXTRA_USER"
2016-11-30 16:27:47 +00:00
Filip Pavlis
d6d67603cf
Merge "Adds data store to provide data abstracion layer for Preferences."
2016-11-30 16:23:02 +00:00
Etan Cohen
1ddf6a6d3a
[AWARE] Data-path creation roles hard-coded for discovery sessions
...
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.
(cherry-pick of commit 9c7483fec41db681a2d6de93a9061fb8764ecba5)
Bug: 32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
2016-11-30 07:10:42 -08:00
Julia Reynolds
c2b7fba6aa
Merge "Blocked packages can't create channels."
2016-11-30 15:09:35 +00:00
Julia Reynolds
a275351745
Merge "Allow apps to set vibrations pattern for channels"
2016-11-30 15:08:13 +00:00
Julia Reynolds
d8d70fafb1
Merge "Shorten log tag."
2016-11-30 15:00:53 +00:00
TreeHugger Robot
003a827b84
Merge "Stop a blink of the final position of shared element."
2016-11-30 14:15:32 +00:00
Julia Reynolds
7e1ffd737e
Shorten log tag.
...
Bug: 32437842
Test: manual
Change-Id: Id6f77a2dec30a4da695232d70e441398285f14d0
2016-11-30 14:00:52 +00:00
Mahaver
7074cafc1b
Update java doc to reflect EXTRA_USER
...
Update java doc for ACTION_MANAGED_PROFILE_PROVISIONED to reflect the
fact that the extra EXTRA_USER will contain the managed profile's
user handle.
Test: NA, Just a java doc update.
Bug: 32301911
Change-Id: Icfda56dea69353ede02ddeee88a7adb489e72d36
2016-11-30 13:59:54 +00:00
Android Build Merger (Role)
4951f90efe
Merge "Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c am: e34370edfd -s ours"
2016-11-30 13:36:13 +00:00
TreeHugger Robot
fe9b40926f
Merge "Allow DO to access DevicePolicyManager.isDeviceManaged()"
2016-11-30 13:35:38 +00:00
Paul Duffin
efc92c2604
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c
...
am: e34370edfd
2016-11-30 13:35:15 +00:00
George Mount
239ba2a3c8
Stop a blink of the final position of shared element.
...
Sometimes a frame from the final layout position of the shared
element was showing on the first frame of the activity showing.
This pushes the first frame to force it until after the transition
has started.
Test: manual testing
Change-Id: I831ed4b419eaadf1aad9d5efbeb99f04eebd0640
2016-11-30 05:13:24 -08:00
Paul Duffin
e34370edfd
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce
...
am: 783096f02c
2016-11-30 12:25:47 +00:00
Paul Duffin
783096f02c
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f
...
am: a485fa1fce
2016-11-30 12:20:11 +00:00
Paul Duffin
a485fa1fce
Merge "Add legacy-test as replacement for core-junit"
...
am: e75a82a92f
2016-11-30 12:15:14 +00:00
Paul Duffin
e75a82a92f
Merge "Add legacy-test as replacement for core-junit"
2016-11-30 12:04:23 +00:00
Paul Duffin
a856247e3a
Merge "Add legacy-test as replacement for core-junit"
2016-11-30 12:00:02 +00:00
Andrei Stingaceanu
6b92a910e1
Merge "AutoSize TextView (part 2) - benchmark number of sizes"
2016-11-30 11:02:54 +00:00
Bartosz Fabianowski
dd7f8dafd8
Allow DO to access DevicePolicyManager.isDeviceManaged()
...
This CL makes DPM.isDeviceManaged() accessible to the DO so that it
can be CTS-tested.
Bug: 32692748
Test: Device policy manager unit test + CTS & GTS in separate CLs
Change-Id: I5326e86b0ffee81d04bd48f0267044463a899b78
2016-11-30 11:09:22 +01:00
TreeHugger Robot
9f9e453b64
Merge "Unit test for getBindDeviceAdminTargetUsers"
2016-11-30 09:58:11 +00:00
