193877 Commits

Author SHA1 Message Date
Alan Viverette
0ee2c1aef9 Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 2015-06-01 18:00:06 +00:00
Chris Craik
5c705d63d7 Fix RenderScript copy tracing sections
bug:21560057

Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186
2015-06-01 10:59:35 -07:00
Yin-Chia Yeh
254ed61671 Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 2015-06-01 17:53:42 +00:00
Alex Klyubin
0de6dea6fb Merge "No need to specify key size when importing." into mnc-dev 2015-06-01 17:53:29 +00:00
Andres Morales
0fddb1a631 Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 2015-06-01 17:50:58 +00:00
Chien-Yu Chen
61bae6d8de Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 2015-06-01 17:50:58 +00:00
Andres Morales
c97b92e346 Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
This reverts commit 831e01a89e9636baf15d35e7f8ff5e9f290c8b87.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a
2015-06-01 17:50:43 +00:00
Alan Viverette
50ba321fbc Prevent crash when ColorStateList has unresolved attrs
Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a
2015-06-01 10:48:55 -07:00
Alan Viverette
7eceda3020 Clean up AbsListView constructor
Change-Id: I5ebe0074849228e5c7fd629df6d1055c867debc8
2015-06-01 10:47:29 -07:00
Yin-Chia Yeh
71c605c54a Camera2: Add missing LEGACY available keys
Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
2015-06-01 10:44:04 -07:00
Alan Viverette
9be801c826 Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 2015-06-01 17:33:21 +00:00
Alan Viverette
7b2f86488c Don't ignore explicit dividerHeight of 0 specified in XML
Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
2015-06-01 10:30:21 -07:00
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off.
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
2015-06-01 10:09:45 -07:00
Alex Klyubin
37c8b411cd No need to specify key size when importing.
The underlying Keymaster implementation no longer requires that.

Bug: 19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749
2015-06-01 09:52:16 -07:00
Alan Viverette
242b9c4eee Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 2015-06-01 16:39:10 +00:00
Abodunrinwa Toki
6c5ac8e9e6 Fix FloatingToolbar look and animation for RTL.
- Fix positioning issues which causes the toolbar to appear cut
since it extends beyond its containing window.
- Fix the open/close overflow animations to open to left (instead
  or right) for RTL.

Bug: 21455067
Change-Id: I799b74c67c96b03bca4b2c9fbb6e1165b651ac7f
2015-06-01 17:35:34 +01:00
John Spurlock
604a5eeed7 Next alarm clock updates.
- Add explicit user setup signal to status bar icon policy.
 - Include per-user next alarm clock info in service dump.

Bug: 21551365
Change-Id: Ib16636522bbe04d205a377567007145f146e9d39
2015-06-01 12:32:46 -04:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)
2015-06-01 16:31:00 +00:00
Joe Fernandez
540d0e0d83 am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
  docs: Android Dashboard - June 2015 update
2015-06-01 16:26:12 +00:00
Filip Gruszczynski
48fe263137 resolved conflicts for merge of a61e23f1 to mnc-dev
Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc
2015-06-01 09:23:14 -07:00
Mady Mellor
3aa33b3da0 Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 2015-06-01 16:17:37 +00:00
Mady Mellor
ef24bc0039 Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 2015-06-01 16:16:20 +00:00
Mady Mellor
cac7b2b175 Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 2015-06-01 16:16:00 +00:00
Filip Gruszczynski
8825de1751 Merge "Revert "Revert "Fix build.""" into mnc-dev 2015-06-01 16:07:48 +00:00
Filip Gruszczynski
919f93265d Revert "Revert "Fix build.""
This reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.

Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e
2015-06-01 16:07:36 +00:00
Joe Fernandez
583b7f2c6d am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
  docs: Android Dashboard - June 2015 update
2015-06-01 16:06:26 +00:00
Alan Viverette
faeac960cc Fix row/column order when unparcelling CollectionItemInfo
Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
2015-06-01 09:03:27 -07:00
smain@google.com
b305410962 am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '67725e2aa47596207ebffc00e3737c609536fe93':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
2015-06-01 16:01:30 +00:00
Filip Gruszczynski
a61e23f13b am 35a803be: Only use outsets for full screen windows.
* commit '35a803beec9ce508fd53ab7e4111f2f9f87296c1':
  Only use outsets for full screen windows.
2015-06-01 16:01:16 +00:00
Joe Fernandez
9bf0e9d03f Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs 2015-06-01 15:52:32 +00:00
Joe Fernandez
d35822027f docs: Android Dashboard - June 2015 update
Change-Id: I81709ea7f4d5ac0abfbd2834c98c4e05b4904878
2015-06-01 08:47:19 -07:00
smain@google.com
67725e2aa4 am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '7f6da0c3cbb9b38d345f7c575d1069d2a85099e5':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
2015-06-01 15:42:57 +00:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Filip Gruszczynski
35a803beec Only use outsets for full screen windows.
Change-Id: I1d89c314b0f9944dfa417ce066c397073d51466e
2015-06-01 08:35:01 -07:00
smain@google.com
7f6da0c3cb add back the GMS and GCM reference lists to fix search suggest.
mistakenly removed during:
https://googleplex-android-review.git.corp.google.com/#/c/697534/1

Change-Id: I804364d98d5dea6110bb309603c80df84c66a19d
2015-06-01 08:21:07 -07:00
Geoff Mendal
c4e5ec3f7f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-01 15:19:51 +00:00
Geoff Mendal
e4a9ecb20a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-01 15:19:19 +00:00
John Spurlock
a58b9a2c06 Merge "Battery saver: limit notification intents to system UI." into mnc-dev 2015-06-01 15:04:26 +00:00
tingna_sung
e785ffa059 Should reset mDismissKeyguard on keyguard secure change
If user sets a non-secure lock screen, launch an activity which
appends window flag FLAG_DISMISS_KEYGUARD, then insert a PIN lock
SIM card, activity window will become black screen.

This is because mDismissKeyguard keeps on DISMISS_KEYGUARD_CONTINUE
when keyguard secure changes from non-secure to secure like in the
insert PIN lock SIM card case. If mDismissKeyguard is
DISMISS_KEYGUARD_CONTINUE and keyguard is secure, there is no chance
to launch keyguard unlock window anymore.

This patch handles the use case that to reset mDismissKeyguard to a
new cycle from DISMISS_KEYGUARD_START to DISMISS_KEYGUARD_CONTINUE
again once keyguard secure state change suddenly to let keyguard
window has chance to be launched.

https://code.google.com/p/android/issues/detail?id=78806

Change-Id: I0d4fd0b9bdf7d0a39f35427bfd4e1b928d9bca6b
Signed-off-by: tingna_sung <tingna_sung@htc.com>

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
2015-06-01 07:56:55 -07:00
John Spurlock
05e0705177 Battery saver: limit notification intents to system UI.
Ensure the actions taken by the HUN warnings came from sysui.

Bug: 20918350
Change-Id: I8dc02ebdfcc1f60d068bea43e10e350dc566728d
2015-06-01 10:56:42 -04:00
Geoff Mendal
870d5db2d6 Import translations. DO NOT MERGE
Change-Id: I486cfef976fec3c97a0f7a07dfdbb65b585e6554
Auto-generated-cl: translation import
2015-06-01 07:56:20 -07:00
Geoff Mendal
14a4c5d418 Import translations. DO NOT MERGE
Change-Id: I04d01f1c65927634e8b27c3780e5e392fcdba28b
Auto-generated-cl: translation import
2015-06-01 07:51:58 -07:00
Selim Cinek
4bd071e590 Merge "Shortened the duration of HUNs" into mnc-dev 2015-06-01 14:50:12 +00:00
Christopher Desjardins
5862c5f85e Fix null pointer dereference when security exception occurs
Just above the SecurityException is a check for r.record == null,
thus dereferencing r.record will cause a null pointer exception.

Found in Android 4.3 with the following steps:

1) Start the music app.
2) Switch to the restricted user.
3) Navigate to Settings->Apps->Running->Music.
4) Tap the stop button.

The security exception should be thrown which results in
a nice message to the user, but instead a null pointer
exception is thrown which results in the settings app
crashing.

Change-Id: I4a306c38650c9d366896e592767dde70adb71c57
2015-06-01 07:45:11 -07:00
Richard MacGregor
0242b153af WindowManagerService not propagating X and Y steps
WindowManagerService received X and Y offset steps but failed to pass
them off to the relavent wallpaperservice.

Live wallpapers expect a valid value for xOffsetStep and yOffsetStep
when the WallpaperService.Engine::onOffsetsChanged function is called
As specified here:
https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html
onOffsetsChanged(float,float, float, float, int, int)

See bug report:
https://code.google.com/p/android/issues/detail?id=173607

Change-Id: I532dedf2db055e27d6eca813e30346e37f52dc65
(cherry picked from commit e03ea68d0a7f7d7c60663feae587225cca3a3a5b)
2015-06-01 07:42:29 -07:00
Andrew Flynn
b2c589c3f7 Change colors of AVD test
so you can actually see the animation rather than animating between
the same color.

Change-Id: Id32f6f5a22c000093fb9cbc1e9274eacbd183373
2015-06-01 09:27:38 -04:00
Neil Fuller
3b7f9615b7 Merge "Fix javadocs based on recent case consistency change" into mnc-dev 2015-06-01 12:04:44 +00:00
Neil Fuller
a5e389ddd2 Fix javadocs based on recent case consistency change
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
(cherry-picked from commit 0e1c0e11e41c85487349fcb719d2ab1d1823534e)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761
2015-06-01 13:02:18 +01:00
Erik Kline
2027d85cbe Send neighbors into NUD_PROBE rather than NUD_DELAY
Now that device kernels have the required kernel patch [1] forcing
neighbors into NUD_PROBE guarantees that:

    (a) all neighbors will be probed, even currently reachable ones
    (b) no spurious neighbor failures will caused

[1] http://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=765c9c639fbb132af0cafc6e1da22fe6cea26bb8

Bug: 18581716
Change-Id: I51ba92a730ceb9a6c5193dfa6d9a0f1d10bbf16b
2015-06-01 18:32:39 +09:00
Erik Kline
ab06923576 Treat RTM_DELNEIGH as a transition to NUD_NONE
RTM_DELNEIGHs can happen naturally during garbage collection of STALE
entries, as well as when an interface is going down.  All other
transitions of interest at this time pass through FAILED.

Bug: 18581716
Bug: 21531726
Change-Id: Ib2a731dd6ad6ece478df6950d4cc7752588328a4
2015-06-01 12:46:24 +09:00