119845 Commits

Author SHA1 Message Date
Craig Mautner
508e88e329 am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
2014-03-08 01:55:33 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Robert Greenwalt
fcbced38a6 DO NOT MERGE Debounce wifi country code Info
We're getting signals from the radio and it sometimes drops out for
a while.  This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately.  It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
2014-03-07 16:54:58 -08:00
Alan Viverette
bca20aaf0e DO NOT MERGE Quick fix for updating the FastScroller long list property
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
2014-03-07 16:50:24 -08:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
2014-03-07 16:47:42 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
2014-03-08 00:17:43 +00:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build.
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
2014-03-07 15:56:14 -08:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
2014-03-07 23:38:30 +00:00
Marco Nelissen
f41efb446a am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '57a45f22ea7b0509fb918fa39e797a6061f75438':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
2014-03-07 23:38:27 +00:00
Craig Mautner
9bf7f893e0 am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
2014-03-07 23:38:20 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Alan Viverette
df262cd922 DO NOT MERGE Check item type before re-binding transient state views
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
2014-03-07 15:20:13 -08:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Jeff Brown
01b5e765e5 Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 2014-03-07 22:15:08 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
2014-03-07 14:10:52 -08:00
Alan Viverette
e8d2846fb9 DO NOT MERGE Ensure transient state views are temporarily detached
BUG: 12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
2014-03-07 14:08:02 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
2014-03-07 14:02:55 -08:00
Marco Nelissen
3442519699 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
2014-03-07 21:18:52 +00:00
Vineeta Srivastava
5ef72c3084 am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit 'f066adde7a3722deba0226715af695537511271e':
  telephony: Add same named operator configuration for some operators
2014-03-07 21:18:47 +00:00
Marco Nelissen
ac87587875 am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
  Make MtpDatabase use libexif instead of libjhead
2014-03-07 21:12:21 +00:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
2014-03-07 21:12:17 +00:00
Marco Nelissen
9823a170e4 Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 2014-03-07 20:23:29 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2014-03-07 11:29:18 -08:00
Vineeta Srivastava
16ed831eb3 am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
2014-03-07 18:45:11 +00:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
2014-03-07 18:40:53 +00:00
Mike J. Chen
b8a7dd639e Merge "Add handshake broadcast support" into klp-modular-dev 2014-03-07 18:40:23 +00:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2014-03-07 18:37:26 +00:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
2014-03-07 10:30:23 -08:00
Leon Scroggins III
48df72f7db am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-07 18:18:35 +00:00
Dianne Hackborn
045ed66519 am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
2014-03-07 18:18:31 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
66069adb9d am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit 'cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
2014-03-07 17:46:42 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
2014-03-07 11:28:44 -05:00
Chris Wren
d1862dac05 am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
  use relative positioning for notification actions
2014-03-07 15:15:08 +00:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Jeff Brown
840c84749a Merge "Add config_supportAutoRotation." into klp-modular-dev 2014-03-07 04:40:10 +00:00
Jeff Brown
7ddc3cec32 Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 2014-03-07 04:39:06 +00:00
Jeff Brown
bcdfc62ae3 Add config_supportAutoRotation.
On some products, it may not make sense to use the accelerometer
to perform auto-rotation.  In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.

Setting this to false also disables auto-rotation settings.

Bug: 13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
2014-03-06 19:57:59 -08:00
Jeff Brown
e7be7915a3 Reorder config.xml constants related to auto-rotation.
Make it a little easier to find all of the relevant resources
in one place.  No functional changes.

Bug: 13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
2014-03-06 18:16:34 -08:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
2014-03-06 17:57:05 -08:00