Joe LaPenna
01186abc81
Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 am: 2900dc2349
...
am: 617bd39465
* commit '617bd39465dd0b77ed2cf353728c2fe97c371b17':
Revert "Don't dispatch when non-interactive and the display is off."
2015-11-18 00:12:02 +00:00
Michael Wright
69e4ce3a6f
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a am: 78f974a0b2
...
am: c173429617
* commit 'c173429617d2a8779f6a4a6ade5a9991f65f751b':
2015-11-18 00:10:45 +00:00
Deepanshu Gupta
00a3f4b32e
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb
...
am: 6058efff69
* commit '6058efff6991e390cfd06540130bdf4407da7522':
2015-11-18 00:09:19 +00:00
Deepanshu Gupta
cd8e8ea0eb
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b am: ef4050128a
...
am: 0a9b4e5f00
* commit '0a9b4e5f00fcc0f785085e642b7894fa14f16e0b':
2015-11-18 00:07:49 +00:00
Deepanshu Gupta
aec98e3a7e
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
...
am: e45abdb126
* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
2015-11-18 00:06:20 +00:00
Michael Wright
1c996ff5b4
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719
...
am: cd00ba1a71
* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
2015-11-18 00:04:52 +00:00
Bryce Lee
20ef5a3f44
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9
...
am: 52d93db91d
* commit '52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
2015-11-18 00:03:17 +00:00
Joe LaPenna
5431e73f14
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours
...
am: 9cb81aa210 -s ours
* commit '9cb81aa210419ea14ff396fb533ad500094b00f2':
2015-11-18 00:01:52 +00:00
Sanket Padawe
0106bef2fa
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517
...
am: fc8f7cee01
* commit 'fc8f7cee0124bee1c75f05a18c112e37705836a9':
2015-11-18 00:00:25 +00:00
Deepanshu Gupta
da5929914b
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7
...
am: 9f275ec3fd
* commit '9f275ec3fd422045f95c048905b112c0a93f4d34':
2015-11-17 23:58:48 +00:00
Michael Kwan
4cb17f362e
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours
...
am: 2c8f3734af -s ours
* commit '2c8f3734afd5f104166bfb045794970414eb5052':
2015-11-17 23:57:12 +00:00
Eino-Ville Talvala
db8822bf0a
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 am: 579cc90e61
...
am: b39fde2c42
* commit 'b39fde2c42b7bb4450eb40a19c6fe9c4f743bd9d':
2015-11-17 23:47:47 +00:00
Erik Wolsheimer
d4985ff1dc
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
...
am: 756b0d2ca2
* commit '756b0d2ca2e3bfb137becff666d33eb5734f796f':
2015-11-17 23:46:15 +00:00
Geoff Mendal
47bd2e6883
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
...
am: 6dff6bc8cd -s ours
* commit '6dff6bc8cde0f71752880b2495d65bd744c11060':
2015-11-17 23:43:53 +00:00
Geoff Mendal
b33916de2a
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours am: ee144ce3ba -s ours
...
am: 73dedf661e -s ours
* commit '73dedf661e8fb6ab77552a715f202dd6c602ddc5':
2015-11-17 23:42:23 +00:00
Wale Ogunwale
8cc5a74c90
Only add NonClientDecorView when needed
...
We were previously adding it to all decor views because it was
required to be able to draw the resizing backdrop. We now manage
the resizing backdrop independently of the NonClientDecorView.
Bug: 25082500
Change-Id: Ib786d55eacd221e5d36a4afca9117d5409499674
2015-11-17 15:41:05 -08:00
Geoff Mendal
6b4b309fa3
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours am: fb17593356 -s ours
...
am: 464ffe98cb -s ours
* commit '464ffe98cb05906430890e767dd422eca8b9466d':
2015-11-17 23:41:01 +00:00
Stephen Hines
e7b1d99617
Merge "Remove unsupported RS graphics API tests." am: 7ea808b177 am: 5a0a713147
...
am: 96761ce3ad
* commit '96761ce3ad66dd29bf4c1586a09c69f214fb4b1d':
Remove unsupported RS graphics API tests.
2015-11-17 23:39:29 +00:00
Rom Lemarchand
7d1428d7f3
resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.
...
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
2015-11-17 15:38:50 -08:00
Michael Wright
ddfdd15c33
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a
...
am: c85b56b0cb -s ours
* commit 'c85b56b0cbdb712a20385df98d2c159b57f82cca':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 23:37:53 +00:00
Chad Brubaker
aaffed261c
Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 am: 97f92ce41e
...
am: 1627a091f4
* commit '1627a091f48d1295653d37a580e30f89005fb6e5':
Add NetworkSecurityConfigProvider.install
2015-11-17 23:36:13 +00:00
Deepanshu Gupta
ae03bc0be3
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
...
am: 377cc4887d
* commit '377cc4887d3557377f63bfe9d179623985c9484e':
Revert "LayoutLib: Fix true transparency in status bar."
2015-11-17 23:34:24 +00:00
Deepanshu Gupta
71daca031e
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
...
am: dd97829cf2
* commit 'dd97829cf2b8599058f0410ea45bc84cd86e839b':
AppCompatActionBar: use findClass to test presence
2015-11-17 23:33:02 +00:00
Svetoslav Ganov
488b4b5872
Merge "Handle renamed packages during default grants" am: 140b101fcd am: 60cb22008c
...
am: 9bf367030c
* commit '9bf367030c24e93c711d2ba9ca5594e70a652596':
Handle renamed packages during default grants
2015-11-17 23:31:42 +00:00
Colin Cross
b2b5c89d8c
Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c am: 358ad4980f
...
am: 68cea4e7d1
* commit '68cea4e7d17cf00ce3001cf23fe36a7f1e77fe86':
Vibra: Add loading of the vibrator hardware module.
2015-11-17 23:30:18 +00:00
Deepanshu Gupta
1a3b1ea872
LayoutLib: IntelliJ changed project files. am: 22931224d9
...
am: ab45fc1a4f
* commit 'ab45fc1a4f9726630322b7579168835d84711bdf':
2015-11-17 23:28:47 +00:00
Michael Wright
9bac0a1d24
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7
...
am: 46f92eafe6 -s ours
* commit '46f92eafe669f3ae29299860bf79378ffa111898':
2015-11-17 23:27:26 +00:00
Chad Brubaker
93f027c32f
Merge "Dedupe trust anchors" am: 690b5f6c0a am: e2caaea951
...
am: d2347a89fb
* commit 'd2347a89fb1a01f550a1b17c68ee234958c1be42':
Dedupe trust anchors
2015-11-17 23:25:52 +00:00
Bryce Lee
85d2e8b4ca
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3
...
am: 4b60d12ef9
* commit '4b60d12ef99a31508be8aed18a53446255f94fc8':
2015-11-17 23:24:09 +00:00
Suprabh Shukla
2359314fd4
Moving recent tasks information to a user directory
...
The directories recent_tasks and recent_images are moved from
/data/system/ to /data/system/users/<n>/
Bug: b/24569398
Change-Id: I538969d86ebf14fb2d44257be1e6c0a7ff61ed8d
2015-11-17 15:23:22 -08:00
Joe LaPenna
33721c935f
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours
...
am: 70e0b4239c -s ours
* commit '70e0b4239c39799988ff007b21c3393b6f410452':
2015-11-17 23:22:52 +00:00
Eino-Ville Talvala
346bc968f9
Merge "Don\'t use timestamps with all zero" am: 9574e58027 am: be1a3f8b66
...
am: 7ca29b3ea2
* commit '7ca29b3ea287883c1c55c62a0e654a87cc81b75d':
Don't use timestamps with all zero
2015-11-17 23:21:29 +00:00
Sanket Padawe
d93fe21662
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78
...
am: 3bc8979d74
* commit '3bc8979d74e8a6c9e0a1c52031bfd0a810bccd1a':
2015-11-17 23:20:08 +00:00
Deepanshu Gupta
433f072cac
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
...
am: ce400cd75e
* commit 'ce400cd75e1e1a90c0b4da4de90d7314fd21dca8':
2015-11-17 23:18:50 +00:00
Michael Kwan
b7fa400367
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours
...
am: 6881185307 -s ours
* commit '6881185307c4f582996fb3a7792453b06857bebb':
2015-11-17 23:17:24 +00:00
Eino-Ville Talvala
d9f32c9f4c
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9
...
am: f5b98ee1dc
* commit 'f5b98ee1dc05c2f9be839c56bf6e90bff99807bc':
2015-11-17 23:16:02 +00:00
Alex Klyubin
8f49178b8f
Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f
...
am: 00245ffce4
* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
Insert Android Keystore JCA Provider at the correct position.
2015-11-17 23:14:38 +00:00
Tony Mantler
d1e3272044
Move AnimatedImageView and AuthenticatorHelper to SettingsLib
...
Change-Id: If3fef35b88b041326c510064679e92a90f31c6b2
2015-11-17 15:14:00 -08:00
Erik Wolsheimer
39d554b7aa
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2015-11-17 23:13:36 +00:00
Erik Wolsheimer
c088a4b995
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
...
am: 2fba776ee0
* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
2015-11-17 23:13:07 +00:00
Erik Wolsheimer
ee25341a9f
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
...
am: 2fba776ee0
* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
2015-11-17 23:11:59 +00:00
Mark Salyzyn
a8d18e8580
Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 am: c53dad8d16
...
am: 45f88d02de
* commit '45f88d02deb8b78f72b7315b5d42567639ad7ece':
Revert "jni: is loggable speedup, not within signal"
2015-11-17 23:10:30 +00:00
Geoff Mendal
46595c4c4f
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
...
am: c94a189e5f -s ours
* commit 'c94a189e5f9ca87fdd314cae3c24c50aacf231dc':
2015-11-17 23:09:06 +00:00
Wale Ogunwale
bf9eefc72f
Move management of BackdropFrameRenderer to DecorView
...
Allows us to have the BackdropFrameRenderer independent of having
a NonClientDecorView.
Bug: 24810450
Change-Id: Ibcda3d722970536ee037b192e90e01da5650ac74
2015-11-17 15:08:33 -08:00
Calin Juravle
8d40c367b0
Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am: e20120031f
...
am: c3a70ce001
* commit 'c3a70ce0015e9117268040378c6adb6239ead897':
Remove obsolete profile handling from AndroidRuntime.
2015-11-17 23:07:36 +00:00
Eino-Ville Talvala
b39fde2c42
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0
...
am: 579cc90e61
* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':
2015-11-17 23:05:48 +00:00
Erik Wolsheimer
756b0d2ca2
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c
...
am: 7698dd970f
* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':
2015-11-17 23:04:24 +00:00
Geoff Mendal
6dff6bc8cd
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
...
am: 812794f0f5 -s ours
* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
Import translations. DO NOT MERGE
2015-11-17 23:02:57 +00:00
Geoff Mendal
73dedf661e
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours
...
am: ee144ce3ba -s ours
* commit 'ee144ce3baec585e19da454de95d05ed0f1a0bcf':
Import translations. DO NOT MERGE
2015-11-17 23:01:15 +00:00
Geoff Mendal
464ffe98cb
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours
...
am: fb17593356 -s ours
* commit 'fb175933566d5869e4d069334abec82f67665083':
2015-11-17 22:59:32 +00:00