192619 Commits

Author SHA1 Message Date
Chris Craik
5f1356c80a Fix GL texture binding for TextureViews
bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b
2015-05-27 11:06:22 -07:00
Paul McLean
aa1cd25db7 Merge "Updating (and completing) documentation post API-council changes." into mnc-dev 2015-05-20 15:56:08 +00:00
Narayan Kamath
e46a5b31d6 Merge "Throw a checked exception on inconsistent installs." into mnc-dev 2015-05-20 15:54:49 +00:00
Paul McLean
8e6c9f4617 Updating (and completing) documentation post API-council changes.
1. Enum/Select/Notify API
2. (re)routing API

bug: 21151568
Change-Id: Idce969c8b8955022b7810cf5dddb800e6aa01000
2015-05-20 07:48:12 -07:00
John Reck
97bf518f7b Merge "Reduce wasted buffer allocations" into mnc-dev 2015-05-20 14:23:24 +00:00
John Reck
4430f16ced Merge "Fix whitespace in TextureView" into mnc-dev 2015-05-20 14:22:59 +00:00
John Reck
35e04a1adf Merge "Fix NPE in setSurfaceTexure" into mnc-dev 2015-05-20 14:22:41 +00:00
John Reck
5ba09488d6 Fix whitespace in TextureView
Change-Id: I22396b7205dc2b9cf0eda5bd8aa951cad8d8bd87
2015-05-20 07:21:51 -07:00
John Reck
8bc511e4eb Fix NPE in setSurfaceTexure
Bug: 20088412
Change-Id: I9b78636a7d89438c8924bb1bf2adba00e74366eb
2015-05-20 07:21:44 -07:00
John Reck
b1f6aebb4a Merge "Fix Bitmap#sameAs NPE" into mnc-dev 2015-05-20 14:18:34 +00:00
Dan Sandler
90ac386b4e Merge "Deal more gracefully with null smallIcons." into mnc-dev 2015-05-20 14:04:36 +00:00
Dan Sandler
3936e7a6fb Deal more gracefully with null smallIcons.
First, when parceling a notification with no small icon:
Well, you shouldn't attempt to do this anyway, since NoMan
will reject a notification without a valid smallIcon.  But
setServiceForeground parcels up the Notification on its own
before handing it off to NoMan, so it will crash on an
invalid small icon. (In general, parceling code should never
ever crash, even if the object is in an undesirable state.)

And when build()ing a notification: Same thing---don't build
a notification with no icon; you're going to have a bad
time. But maybe you're going to fix it before you hand it
off to NoMan. Or maybe it's just one page of a wearable
notification, so it doesn't really need its own icon. Either
way, Notification shouldn't crash.

Bug: 21286186
Bug: 21298403
Change-Id: Ie482cde0a3afe3aaabf07be0536551b8e4bceba0
2015-05-20 10:00:54 -04:00
Jason Monk
e15cecc90c Merge "Don't crash in bugreport on devices without BT" into mnc-dev 2015-05-20 13:16:02 +00:00
Paul Jensen
2e54f13b46 Merge "Report invalid network after one failed attempt." into mnc-dev 2015-05-20 12:56:25 +00:00
Paul Jensen
cb7c035081 Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev 2015-05-20 10:49:04 +00:00
Narayan Kamath
c52ae28006 Throw a checked exception on inconsistent installs.
Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change b904863476991d8540d37d5.

bug: 21144503

Change-Id: Idb6a33f93b70b4e5e2bca95d2d3af0e2adaeedf3
2015-05-20 11:12:47 +01:00
Andrei Stingaceanu
8c44e74524 Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 2015-05-20 09:32:50 +00:00
Andrei Stingaceanu
975a8d0f4d Landscape extracted mode - floating toolbar interference
In landscape do not allow starting selection modes if the
extracted mode has not yet started. Also remove the single
tap selection delayed runnable.

This allows for a smooth transition (as in no floating
toolbar artifacts) into extracted mode. Also fixes
(more as in hides) the double selections.

Bug: 20930071
Change-Id: Idb9c375dc25777761b11ca17ccfd9f5eedc642b4
2015-05-20 10:31:19 +01:00
Erik Kline
6f611d7267 Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 2015-05-20 08:05:22 +00:00
Erik Kline
cef7bc939f Set NLM_F_ACK in our RTM_NEWNEIGH requests
With NLM_F_ACK set in RTM_NEWNEIGH requests we get some response from
the kernel, whether there was an error or not.

Additionally:

    [1] add IpReachabilityMonitor#probeNeighbor() as a public
        static method, since it actually depends very little on the
        class internals and might be of larger use.

    [2] add a unittest for parsing NetlinkErrorMessages.

Bug: 18581716
Change-Id: I5d62e7a9972c7440f0483c38c77677436d3a1a25
2015-05-20 16:46:30 +09:00
Lorenzo Colitti
4b545dfbcd Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 2015-05-20 05:49:03 +00:00
Nitin Arora
11f83882f2 Bluetooth: Clear BLE always ON apps at Airplane mode
This patch clears the container managing the Ble Always On
apps while switching on, the airplane mode. The airplane mode
will completely turn Off the Bleutooth Adapter from any state
it is in.

Change-Id: Ib28d39d85efe3aac37e3a53a4fb892099568c702
2015-05-19 22:38:46 -07:00
Dongwon Kang
cf4f3d5c4c TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
Bug: 21313401
Change-Id: I73e55c454cf0e2cd90d922acf5c6efe727f59204
2015-05-20 13:57:34 +09:00
Erik Kline
77b01b8876 Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev 2015-05-20 03:26:14 +00:00
Erik Kline
abd3142dca Close netlink socket when shutting down IpReachabilityMonitor
This forces the NetlinkSocketObserver thread to exit quickly, rather
than lingering until the next random netlink neighbor multicast message
arrives.

Additionally, add a small unittest to verify that multiple calls to
NetlinkSocket#close() are safe.

Change-Id: I101730fad7eee72f9c6e8a7e7bd10c634f2ceab4
2015-05-20 12:08:55 +09:00
Deepanshu Gupta
1c5bf7f1dd Merge "Make Context.getClassLoader() work." into mnc-dev 2015-05-20 03:05:52 +00:00
Deepanshu Gupta
f8ea750455 Make Context.getClassLoader() work.
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
2015-05-19 19:56:20 -07:00
Svetoslav
f357c96273 Merge "Prevent modification of system fixed permissions" into mnc-dev 2015-05-20 01:57:44 +00:00
Simranjit Singh Kohli
bdf2d1fa38 Merge "[Fix Potential for error]:" into mnc-dev 2015-05-20 01:04:57 +00:00
Adrian Roos
1bbe3d4b75 Merge "Fix user switcher ripple emanation point" into mnc-dev 2015-05-20 00:43:47 +00:00
Simranjit Singh Kohli
6a184878f8 [Fix Potential for error]:
Init for accounts maybe called when non-system app asks for accounts.
That might lead to deletion of accounts and broadcast from the user,
which requires permission. Hence, we should clear calling identity
before requesting it.

Bug: 21140169

Change-Id: I057ac6778ea53d3f96b3e5c42fe3a2fe60c3cf28
2015-05-19 17:38:10 -07:00
Christopher Tate
f7a9aaa12e Merge "Rebind backup transports only when clearly needed" into mnc-dev 2015-05-20 00:07:12 +00:00
Christopher Tate
1a78d8c2b8 Rebind backup transports only when clearly needed
Significantly narrow the circumstances under which transports
will be re-bound.  In particular, we now do not unbind + rebind
whenever any component in a bound transport's host package changes;
rather, we do so only when the transport component itself has
changed state, or when there is a state change that might cause
a new transport to become available.

Bug 19775237

Change-Id: Ib386875df19ffe9f2d3eb9f9788187338360644a
2015-05-19 17:05:22 -07:00
Svetoslav
6503e69d1d Prevent modification of system fixed permissions
Change-Id: I061b993df305f27e52f08dad54f1bdbf162de4d9
2015-05-19 16:49:53 -07:00
Jean-Michel Trivi
1705113e91 Merge "API for converting AudioAttributes to stream type" into mnc-dev 2015-05-19 23:42:34 +00:00
Jean-Michel Trivi
d1d5a0a080 API for converting AudioAttributes to stream type
Bug 21267880

Change-Id: I3389dcb3a35a3786ecdb8f56a917a0ae619e8417
2015-05-19 16:35:25 -07:00
Svetoslav
6d9a53abbc Merge "Handle downgrading a runtime permission to an install one" into mnc-dev 2015-05-19 23:30:48 +00:00
Svetoslav
a1d0f3031f Handle downgrading a runtime permission to an install one
bug:21300531

Change-Id: I5c020c0faae3e727bbe898441c58116e2ab892b8
2015-05-19 16:27:00 -07:00
Joe Fernandez
e56cce575b am 25a3b711: am 97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '25a3b7117a174e2a0dccdaf84c8394e5bdf1e7ca':
  docs: M Preview - Updating image for Program Overview
2015-05-19 23:16:10 +00:00
Yigit Boyar
bf6d1ebc4b am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '9b7167937ab5ea456c45e735d3bd749ccf49c432':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-19 23:15:48 +00:00
John Reck
3df4869a77 Fix Bitmap#sameAs NPE
Bug: 21281842

Change-Id: I4a1e33d7e642fa50e8789f1441e8587d1c15119c
2015-05-19 16:06:16 -07:00
Daichi Hirono
b7d072f42f Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev 2015-05-19 22:20:43 +00:00
Wei Wang
de35f0d952 Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev 2015-05-19 22:10:24 +00:00
Joe Fernandez
25a3b7117a am 97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '97c616cb113ba3144ff91b7f974d832fdc5ff0f0':
  docs: M Preview - Updating image for Program Overview
2015-05-19 22:07:20 +00:00
Prerepa Viswanadham
f5e368ff26 setCallbackType should be public for onlost/onfound apis
Bug: 21304922
Change-Id: I27ed4f3e00ac13354e3ef75e5686916be0d10918
2015-05-19 22:04:56 +00:00
Jeff Sharkey
891230b59e Merge "Push initial disk state, handle empty media." into mnc-dev 2015-05-19 22:04:54 +00:00
Fabrice Di Meglio
b3793d7201 Merge "Add IntentFilter auto verification - part 12" into mnc-dev 2015-05-19 22:02:40 +00:00
John Reck
63005e6e5b Reduce wasted buffer allocations
Bug: 20170924

Don't pre-allocate buffers if there is a SurfaceView or other
View that has requested transparent regions. This doesn't fully
address the problem of allocating buffers when there's a full
screen SurfaceView but it at least gets back to KitKat levels
of only having 1 wasted buffer instead of 3 (the 1 being
a result of the fact that it will still draw one frame of emptiness
forcing a buffer dequeue).

Change-Id: Ied9553186bc7b111d180b63f87b92bd317cb4b97
2015-05-19 15:00:13 -07:00
Joe Fernandez
97c616cb11 Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs 2015-05-19 21:59:15 +00:00
Jeff Sharkey
f5a6bd7538 Push initial disk state, handle empty media.
Stash volume count from last scan, and use it to push initial storage
notifications state when listener is first attached.

Also omit disks with invalid size, which usually means they're an
empty slot with no media.

Bug: 20503551
Change-Id: I75097035aebaad70ba32437179a863f6a0910aa5
2015-05-19 14:57:22 -07:00