Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,077 Commits 3 Branches 0 Tags
e2355020d80766855052803bf2e7ff577cbbbea3
Commit Graph

48329 Commits

Author SHA1 Message Date
John Reck
e2355020d8 am b2d91b7f: am a420e3ad: am 4430f16c: Merge "Fix whitespace in TextureView" into mnc-dev 
* commit 'b2d91b7f6a76c9cdf4f315a2fa0663d3fbae668b':
  Fix whitespace in TextureView
 2015-05-20 14:54:36 +00:00
John Reck
93611a01de am be9a3190: am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev 
* commit 'be9a31903ef0617915c377c8da7cbf88a22f5cc5':
  Fix NPE in setSurfaceTexure
 2015-05-20 14:54:31 +00:00
Dan Sandler
f55c9c9f67 am 6e53d7ef: am 2f99ca32: am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev 
* commit '6e53d7ef75584dc978e50e9f0b2e7399f1c913a9':
  Deal more gracefully with null smallIcons.
 2015-05-20 14:41:28 +00:00
John Reck
b2d91b7f6a am a420e3ad: am 4430f16c: Merge "Fix whitespace in TextureView" into mnc-dev 
* commit 'a420e3ad0fc92501c7744a462c7d4e531f1d5117':
  Fix whitespace in TextureView
 2015-05-20 14:41:06 +00:00
John Reck
be9a31903e am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev 
* commit '10a024bf45ed079b32dc4973147c5a47ad9db51c':
  Fix NPE in setSurfaceTexure
 2015-05-20 14:41:00 +00:00
Dan Sandler
6e53d7ef75 am 2f99ca32: am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev 
* commit '2f99ca32dbd29b3281b8464133f741c58f8ed05c':
  Deal more gracefully with null smallIcons.
 2015-05-20 14:28:16 +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
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
Paul Jensen
e0af3ab4f8 am d3a56eda: am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev 
* commit 'd3a56eda9d3d4320721c8fe8c50c247e895a63a7':
  Undeprecate android.net.ProxyInfo as it's still used.
 2015-05-20 13:18:09 +00:00
Andrei Stingaceanu
05b0e67767 am a53349dd: am 886e9478: am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 
* commit 'a53349dd55cdd7592e28bc51e71c7111340337f8':
  Landscape extracted mode - floating toolbar interference
 2015-05-20 13:17:58 +00:00
Erik Kline
f2197abc3f am 1fe11908: am f9855b64: am 6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 
* commit '1fe11908216b99c5414bc3634934a6665684717e':
  Set NLM_F_ACK in our RTM_NEWNEIGH requests
 2015-05-20 13:17:45 +00:00
Lorenzo Colitti
1e6b24b381 am d59c3e95: am 485826b2: am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 
* commit 'd59c3e95310ffe6a5fdf03c245a092e6a120b9da':
  Add a hidden method to clear the capabilities of a NetworkRequest
 2015-05-20 13:17:19 +00:00
Erik Kline
076c63d6e5 am ba510e65: am d1e4c154: am 77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev 
* commit 'ba510e65b64b60aa11312c1d3df8fb437769f59d':
  Close netlink socket when shutting down IpReachabilityMonitor
 2015-05-20 13:17:02 +00:00
Yigit Boyar
a92f85e861 am 08cec07f: am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev 
* commit '08cec07f8e1f9f6fb3675d6dfaae8bb2229f4183':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-05-20 13:14:40 +00:00
Paul Jensen
d3a56eda9d am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev 
* commit '886ab256447f26fc21dfd328e070a11bcfd06374':
  Undeprecate android.net.ProxyInfo as it's still used.
 2015-05-20 11:07:34 +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
Andrei Stingaceanu
a53349dd55 am 886e9478: am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 
* commit '886e9478f53d62bdcf70302e4c3daa23afde9f5e':
  Landscape extracted mode - floating toolbar interference
 2015-05-20 10:00:30 +00:00
Erik Kline
1fe1190821 am f9855b64: am 6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 
* commit 'f9855b642c0d1cb5a93a9287a6a9b0e1b560792c':
  Set NLM_F_ACK in our RTM_NEWNEIGH requests
 2015-05-20 09:52:04 +00: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
Lorenzo Colitti
d59c3e9531 am 485826b2: am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 
* commit '485826b2655836e6aa5cae10effe3bedca3d77d2':
  Add a hidden method to clear the capabilities of a NetworkRequest
 2015-05-20 08:20:33 +00: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
Erik Kline
ba510e65b6 am d1e4c154: am 77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev 
* commit 'd1e4c154b57c1aa972a9f96ab59dec6c76413a80':
  Close netlink socket when shutting down IpReachabilityMonitor
 2015-05-20 07:01:53 +00: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
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
Yigit Boyar
08cec07f8e am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev 
* commit '3c9b4bb278c268129a070dd75a58a26b5372d985':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-05-20 00:47:15 +00:00
Wei Wang
17bb1205d7 am 8c4bad20: am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev 
* commit '8c4bad200cc21cac3626bb1ab022448b85cc6a33':
  setCallbackType should be public for onlost/onfound apis
 2015-05-19 23:17:08 +00:00
Jeff Sharkey
e32e53bf75 am 43cafdc7: am 2d5d8926: am 891230b5: Merge "Push initial disk state, handle empty media." into mnc-dev 
* commit '43cafdc775d83902d18158fe5a12b8880c188c50':
  Push initial disk state, handle empty media.
 2015-05-19 23:17:03 +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
Eino-Ville Talvala
40c96f7f72 am 2876261b: am b6abdacc: am 1975b0a4: Merge "Camera2: Fix session close callback" into mnc-dev 
* commit '2876261b1f441f9ad81d52a52eeebd5c896b5565':
  Camera2: Fix session close callback
 2015-05-19 23:04:59 +00:00
Dianne Hackborn
237f4b3d3d am 98e45457: am f24a522c: am 2d9c6015: Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev 
* commit '98e454575cc2038088aedd2a2a7cb01bf8b8e8af':
  Fix issue #20679383: Add text style to assist.ViewNode...
 2015-05-19 23:04:33 +00:00
Paul Jensen
2765492c5f am d6e54755: am 06c48119: am c1a9436d: Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev 
* commit 'd6e54755ddce80d530f8486a1de456ca05d69c64':
  Query HTTP proxy for network via a new API to avoid permissions exceptions
 2015-05-19 23:04:06 +00:00
Eino-Ville Talvala
c8c3e896e7 am 424ab24d: am c79976eb: am 77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev 
* commit '424ab24d8afec1d8db917ed2107001ea08ffd95d':
  Camera2: Add SDK annotations
 2015-05-19 23:03:56 +00:00
Hemant Gupta
03c08f2f42 am 0a5da718: am 2ea2465f: am 58fbffc3: Bluetooth: Check for mPanService before changing tethering state 
* commit '0a5da7186a93e47860222035e2ad1a44e1a48ca3':
  Bluetooth: Check for mPanService before changing tethering state
 2015-05-19 23:03:29 +00:00
Yohei Yukawa
f7c40d34a4 am e97ecba7: am fae01126: am c2cc6fff: Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev 
* commit 'e97ecba7f45bd9824f7d6f3db24de6470cfa506f':
  Keep IMM#mCurRootView synchronized with the actual window focus.
 2015-05-19 23:03:18 +00:00
Wei Wang
8c4bad200c am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev 
* commit '78011ba9db257e7ae0bc06d49104c6f4bebc799e':
  setCallbackType should be public for onlost/onfound apis
 2015-05-19 23:03:11 +00:00
Dianne Hackborn
31af1eebd2 am a7c407d7: am 1e338c0f: am 8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev 
* commit 'a7c407d7d44b7a294a9f7a0ba6da2e6d72c26846':
  Update power manager to track uid state like netstats.
 2015-05-19 23:03:07 +00:00
Jeff Sharkey
43cafdc775 am 2d5d8926: am 891230b5: Merge "Push initial disk state, handle empty media." into mnc-dev 
* commit '2d5d8926eab83d80994c559c2128ca591d41237c':
  Push initial disk state, handle empty media.
 2015-05-19 23:03:06 +00:00
Eino-Ville Talvala
2876261b1f am b6abdacc: am 1975b0a4: Merge "Camera2: Fix session close callback" into mnc-dev 
* commit 'b6abdacc83799c21b8b8376b4de2a0d667720a0a':
  Camera2: Fix session close callback
 2015-05-19 22:51:37 +00:00
Dianne Hackborn
98e454575c am f24a522c: am 2d9c6015: Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev 
* commit 'f24a522c79c7d3c7e6ffe6cf105da90bad95c511':
  Fix issue #20679383: Add text style to assist.ViewNode...
 2015-05-19 22:51:03 +00:00
Paul Jensen
d6e54755dd am 06c48119: am c1a9436d: Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev 
* commit '06c48119ed1b0a6e32f3811f368dcece1baa75bf':
  Query HTTP proxy for network via a new API to avoid permissions exceptions
 2015-05-19 22:50:30 +00:00
Eino-Ville Talvala
424ab24d8a am c79976eb: am 77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev 
* commit 'c79976ebebf86abed84ceb6afa9e154ae35e0bb7':
  Camera2: Add SDK annotations
 2015-05-19 22:50:18 +00:00
Hemant Gupta
0a5da7186a am 2ea2465f: am 58fbffc3: Bluetooth: Check for mPanService before changing tethering state 
* commit '2ea2465f2e401d4bec71f4cf605bcc4bc958db6c':
  Bluetooth: Check for mPanService before changing tethering state
 2015-05-19 22:49:29 +00:00
Yohei Yukawa
e97ecba7f4 am fae01126: am c2cc6fff: Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev 
* commit 'fae01126800386a892da70c9b2763843bccff18d':
  Keep IMM#mCurRootView synchronized with the actual window focus.
 2015-05-19 22:49:15 +00:00
Dianne Hackborn
a7c407d7d4 am 1e338c0f: am 8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev 
* commit '1e338c0f3ba6366bec3ec4bf9034cb2135f16a7d':
  Update power manager to track uid state like netstats.
 2015-05-19 22:49:03 +00:00