Yorke Lee
5aca9cbba1
Merge "Fix for drag start event being incorrectly cached" into nyc-dev am: 26903a3431
...
am: 2e2bb0a789
* commit '2e2bb0a7892bb393c403c8979fc4edab68e7bb49':
Fix for drag start event being incorrectly cached
2016-03-12 00:19:43 +00:00
Andrii Kulian
d3abc5e8b5
Merge "Update docs for DisplayMetrics pixel size fields" into nyc-dev am: d5db062682
...
am: dd6ca42934
* commit 'dd6ca42934a00725d9f983e2ec144524e96895d1':
Update docs for DisplayMetrics pixel size fields
2016-03-12 00:19:41 +00:00
Yorke Lee
2e2bb0a789
Merge "Fix for drag start event being incorrectly cached" into nyc-dev
...
am: 26903a3431
* commit '26903a34317a3137b49ed405e1388ec6f44f1f40':
Fix for drag start event being incorrectly cached
2016-03-12 00:13:50 +00:00
Andrii Kulian
dd6ca42934
Merge "Update docs for DisplayMetrics pixel size fields" into nyc-dev
...
am: d5db062682
* commit 'd5db0626825e3a91efcc40f585ac65602d111247':
Update docs for DisplayMetrics pixel size fields
2016-03-12 00:13:48 +00:00
Yorke Lee
26903a3431
Merge "Fix for drag start event being incorrectly cached" into nyc-dev
2016-03-12 00:04:48 +00:00
Fyodor Kupolov
62058e4255
Merge "Added logoutCurrentUser method" into nyc-dev am: 89f1622e48
...
am: f51cd20795
* commit 'f51cd20795386cdeacbcfb69c202e4b96354189f':
Added logoutCurrentUser method
2016-03-11 23:58:47 +00:00
Alex Klyubin
7dc701956f
Merge "Workaround for verifying large APKs." into nyc-dev am: 026cf53fe4
...
am: ea9917a570
* commit 'ea9917a5709fd0845a221cbae2fd8821c85f3d2f':
Workaround for verifying large APKs.
2016-03-11 23:58:44 +00:00
Makoto Onuki
31ed48d735
Merge "Add a flag to log service side runtime exception" into nyc-dev am: 4b19f4a702
...
am: 5592d0ed7c
* commit '5592d0ed7cb7311cb85683c5e2604e43124abd41':
Add a flag to log service side runtime exception
2016-03-11 23:58:40 +00:00
Ruben Brunk
9fba796ea5
Merge "Allow per-package exemptions for restricted AppOps" into nyc-dev am: 89db9dbedb
...
am: c5630f8247
* commit 'c5630f8247141a346790ce9a5454629a0d297115':
Allow per-package exemptions for restricted AppOps
2016-03-11 23:58:38 +00:00
Doris Liu
9231adf2aa
Merge "Set end value immediately when start a 0-duration animation" into nyc-dev am: 5a705d0bbb
...
am: d6c67154cb
* commit 'd6c67154cbed7f548591421d997173765d88f6b9':
Set end value immediately when start a 0-duration animation
2016-03-11 23:58:29 +00:00
Todd Kennedy
bfbcf324fe
Merge "Allow app downgrades" into nyc-dev am: b0f6e311ce
...
am: 52e1a26891
* commit '52e1a2689125a048e027068f31a2145a97de2042':
Allow app downgrades
2016-03-11 23:58:23 +00:00
Todd Kennedy
8e3a15b474
Merge "Add minSdk to dumpsys" into nyc-dev am: 1374af2c7b
...
am: aa2b0035de
* commit 'aa2b0035de76a44e2624dd2a4a03408b097e7ac5':
Add minSdk to dumpsys
2016-03-11 23:58:21 +00:00
Fyodor Kupolov
f51cd20795
Merge "Added logoutCurrentUser method" into nyc-dev
...
am: 89f1622e48
* commit '89f1622e48206d2f8ebd9af9c32449f1f8eab7d1':
Added logoutCurrentUser method
2016-03-11 23:54:21 +00:00
Alex Klyubin
ea9917a570
Merge "Workaround for verifying large APKs." into nyc-dev
...
am: 026cf53fe4
* commit '026cf53fe46a3da512088212f22a2989993eb963':
Workaround for verifying large APKs.
2016-03-11 23:54:20 +00:00
Makoto Onuki
5592d0ed7c
Merge "Add a flag to log service side runtime exception" into nyc-dev
...
am: 4b19f4a702
* commit '4b19f4a702b9da07c91d093b922b30163ddd1471':
Add a flag to log service side runtime exception
2016-03-11 23:54:18 +00:00
Ruben Brunk
c5630f8247
Merge "Allow per-package exemptions for restricted AppOps" into nyc-dev
...
am: 89db9dbedb
* commit '89db9dbedbb250e012d5853a7c3ae2b8fa070ecc':
Allow per-package exemptions for restricted AppOps
2016-03-11 23:54:17 +00:00
Doris Liu
d6c67154cb
Merge "Set end value immediately when start a 0-duration animation" into nyc-dev
...
am: 5a705d0bbb
* commit '5a705d0bbbd1f5eb117170c9c68399cc7b484b7a':
Set end value immediately when start a 0-duration animation
2016-03-11 23:54:10 +00:00
Todd Kennedy
52e1a26891
Merge "Allow app downgrades" into nyc-dev
...
am: b0f6e311ce
* commit 'b0f6e311ce19add792048db855844e542e808dd6':
Allow app downgrades
2016-03-11 23:54:03 +00:00
Todd Kennedy
aa2b0035de
Merge "Add minSdk to dumpsys" into nyc-dev
...
am: 1374af2c7b
* commit '1374af2c7be265701b9b402b7d4749ffe716ef01':
Add minSdk to dumpsys
2016-03-11 23:54:00 +00:00
Andrii Kulian
d5db062682
Merge "Update docs for DisplayMetrics pixel size fields" into nyc-dev
2016-03-11 23:50:47 +00:00
Fyodor Kupolov
89f1622e48
Merge "Added logoutCurrentUser method" into nyc-dev
2016-03-11 23:25:10 +00:00
Alex Klyubin
026cf53fe4
Merge "Workaround for verifying large APKs." into nyc-dev
2016-03-11 23:03:59 +00:00
Makoto Onuki
4b19f4a702
Merge "Add a flag to log service side runtime exception" into nyc-dev
2016-03-11 22:52:35 +00:00
Alex Klyubin
005c7caa61
Workaround for verifying large APKs.
...
When an APK is verifier during installation, the recently added
APK Signature Scheme v2 code uncondionally memory-maps the whole file.
This fails for very large APKs, even those which are not signed with
APK Signature Scheme, thus preventing installation of such APKs.
This temporary workaround pretends that the APK is not signed with
APK Signature Scheme v2 if the APK cannot be memory-mapped because
there's insufficient memory.
This workaround will be removed soon, once APK Signature Scheme v2
APK verification logic can handle very large APKs.
Bug: 27613575
Change-Id: I27bad534855fe4bf3e09b1087398ffdd7f98f482
2016-03-11 14:51:47 -08:00
Ruben Brunk
89db9dbedb
Merge "Allow per-package exemptions for restricted AppOps" into nyc-dev
2016-03-11 22:48:38 +00:00
Ruben Brunk
29931bc684
Allow per-package exemptions for restricted AppOps
...
- When setting blanket user restrictions, per-package
exemptions may be granted.
- Exempt the current active VrListenerService from the
blanket restriction on drawing overlays while in VR mode.
Bug: 26775563
Change-Id: I14b17a126502c7905a970ad42d25d6dd600b86b1
2016-03-11 14:05:44 -08:00
Doris Liu
5a705d0bbb
Merge "Set end value immediately when start a 0-duration animation" into nyc-dev
2016-03-11 20:25:21 +00:00
Todd Kennedy
b0f6e311ce
Merge "Allow app downgrades" into nyc-dev
2016-03-11 19:38:35 +00:00
Todd Kennedy
c84d1ab11a
Allow app downgrades
...
only system apps can do this
Change-Id: If0947f13f5c447f9396690bfda3ad40b07fbbb6b
2016-03-11 11:37:17 -08:00
Todd Kennedy
1374af2c7b
Merge "Add minSdk to dumpsys" into nyc-dev
2016-03-11 19:26:37 +00:00
Todd Kennedy
89d60189cd
Add minSdk to dumpsys
...
Bug: 27526333
Change-Id: I0148275013ebab899bcb63c07d71a840539c1863
2016-03-11 11:18:32 -08:00
Alan Viverette
a019841dd1
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev am: 79936ddda4
...
am: a3710fbd27
* commit 'a3710fbd2780fe6decd11d2bc259f0c3b6e28f71':
Add consistent @NonNull annotations for drawable callbacks
2016-03-11 18:59:49 +00:00
Eino-Ville Talvala
dccaa2809e
Merge "Camera2: Add buffer drop error callback" into nyc-dev am: 95171050e9
...
am: e398d06352
* commit 'e398d063523a492c2f3b27a9bc5611e702893efb':
Camera2: Add buffer drop error callback
2016-03-11 18:59:46 +00:00
Alan Viverette
a3710fbd27
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
...
am: 79936ddda4
* commit '79936ddda4c8d1709f736cda013070c3ab32db6f':
Add consistent @NonNull annotations for drawable callbacks
2016-03-11 18:49:50 +00:00
Alan Viverette
79936ddda4
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
2016-03-11 18:42:43 +00:00
Yorke Lee
0394b2127f
Fix for drag start event being incorrectly cached
...
Since DRAG_END is now being delivered only to views that
returned true from DRAG_STARTED, make sure to clear
mCurrentDragStartEvent when returning false from DRAG_STARTED,
to avoid incorrectly sending DRAG_STARTED events to children
views on visibility changes.
Bug: 27595763
Change-Id: Ic18628b48b474351e2433e871bf545657a6ebf52
2016-03-11 18:20:10 +00:00
Eino-Ville Talvala
e398d06352
Merge "Camera2: Add buffer drop error callback" into nyc-dev
...
am: 95171050e9
* commit '95171050e9877deb9b1f84b4c55aa828229e2809':
Camera2: Add buffer drop error callback
2016-03-11 18:18:13 +00:00
Eino-Ville Talvala
95171050e9
Merge "Camera2: Add buffer drop error callback" into nyc-dev
2016-03-11 18:13:01 +00:00
Makoto Onuki
94ae124147
Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev am: 04efe9e5ff
...
am: 0408672bcb
* commit '0408672bcbc9a23ff2c83962ceb8399aa0dbc087':
Test for ShortcutManager.updateShortcuts(), also
2016-03-11 18:10:04 +00:00
Makoto Onuki
0408672bcb
Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev
...
am: 04efe9e5ff
* commit '04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac':
Test for ShortcutManager.updateShortcuts(), also
2016-03-11 18:06:01 +00:00
Makoto Onuki
04efe9e5ff
Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev
2016-03-11 18:00:18 +00:00
Alan Viverette
146dbea111
Merge "Add temporary logging to SimpleMonthView" into nyc-dev am: d969cc6856
...
am: 9f4f4f3962
* commit '9f4f4f39623322776d94b9636ee1e8a16265e89c':
Add temporary logging to SimpleMonthView
2016-03-11 15:14:36 +00:00
Alan Viverette
9f4f4f3962
Merge "Add temporary logging to SimpleMonthView" into nyc-dev
...
am: d969cc6856
* commit 'd969cc68560bbec8d17c610b9330155ea8c65624':
Add temporary logging to SimpleMonthView
2016-03-11 15:12:30 +00:00
Alan Viverette
f6d87ec193
Add consistent @NonNull annotations for drawable callbacks
...
Bug: 27599515
Change-Id: I33fdc5392302403bfff9cc74a8226173ec962af6
2016-03-11 10:09:14 -05:00
Alan Viverette
d969cc6856
Merge "Add temporary logging to SimpleMonthView" into nyc-dev
2016-03-11 15:08:25 +00:00
Jorim Jaggi
439affd23c
Merge "Add ability to swap docked/fullscreen stack" into nyc-dev am: 95b69f8231
...
am: b1e14fc05e
* commit 'b1e14fc05e591856d5f6cfec30a538341aa00f91':
Add ability to swap docked/fullscreen stack
2016-03-11 12:08:37 +00:00
Jorim Jaggi
b1e14fc05e
Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
...
am: 95b69f8231
* commit '95b69f82316220bc40d227bf7208920eb6ed9283':
Add ability to swap docked/fullscreen stack
2016-03-11 12:06:04 +00:00
Jorim Jaggi
95b69f8231
Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
2016-03-11 12:02:38 +00:00
Keisuke Kuroyanagi
2b8c98187b
Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev am: 13d66d8456
...
am: f6c1149985
* commit 'f6c1149985b6dff5c17af1d8b4eb7a0da3257456':
Fix: Context menu can contain obsolete suggestions.
2016-03-11 11:35:03 +00:00
Keisuke Kuroyanagi
f6c1149985
Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev
...
am: 13d66d8456
* commit '13d66d8456ec4661a9eda5f26e72b1d9188bfbe6':
Fix: Context menu can contain obsolete suggestions.
2016-03-11 11:31:13 +00:00