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

194195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
255c90b4ee am aa488cb8: am e15cecc9: Merge "Don\'t crash in bugreport on devices without BT" into mnc-dev 
* commit 'aa488cb83507ee7e469c4d8c6aa3198b3010d79e':
  Don't crash in bugreport on devices without BT
 2015-05-20 13:43:02 +00:00
Jason Monk
aa488cb835 am e15cecc9: Merge "Don\'t crash in bugreport on devices without BT" into mnc-dev 
* commit 'e15cecc90cbe0b7ae39e524e612fb6043324bad8':
  Don't crash in bugreport on devices without BT
 2015-05-20 13:28:53 +00:00
Paul Jensen
db829c0434 am db4010b3: am 2e54f13b: Merge "Report invalid network after one failed attempt." into mnc-dev 
* commit 'db4010b3fe70d2a2123952534a808dd961426676':
  Report invalid network after one failed attempt.
 2015-05-20 13:22:12 +00: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
db4010b3fe am 2e54f13b: Merge "Report invalid network after one failed attempt." into mnc-dev 
* commit '2e54f13b468a3abfc404ad5b7eed6bf2c73f55de':
  Report invalid network after one failed attempt.
 2015-05-20 13:09:20 +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
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
886ab25644 am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev 
* commit 'cb7c035081c650ea356b625ed51865c6e3b18d21':
  Undeprecate android.net.ProxyInfo as it's still used.
 2015-05-20 10:55:54 +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
886e9478f5 am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 
* commit '8c44e74524a43ad7cb41b1641bb2dac75cf9c7e8':
  Landscape extracted mode - floating toolbar interference
 2015-05-20 09:51:47 +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
Erik Kline
f9855b642c am 6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 
* commit '6f611d72679f69f2a7eb544407a0c8ec02f74595':
  Set NLM_F_ACK in our RTM_NEWNEIGH requests
 2015-05-20 08:20:50 +00: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
Nitin Arora
3218b1f24e am e32913d5: am 11f83882: Bluetooth: Clear BLE always ON apps at Airplane mode 
* commit 'e32913d53875fcd07f8c16aa280cccee0a30f2f1':
  Bluetooth: Clear BLE always ON apps at Airplane mode
 2015-05-20 08:20:28 +00:00
Dongwon Kang
c40b0ec847 am 8989d34c: am cf4f3d5c: TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams() 
* commit '8989d34c2da63e6ea25776d8f817b4d3105f6970':
  TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
 2015-05-20 08:20:23 +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
Lorenzo Colitti
485826b265 am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 
* commit '4b545dfbcd6ed724d5fc01b7ba21506db99e881b':
  Add a hidden method to clear the capabilities of a NetworkRequest
 2015-05-20 07:04:11 +00:00
Nitin Arora
e32913d538 am 11f83882: Bluetooth: Clear BLE always ON apps at Airplane mode 
* commit '11f83882f2a4448b5a2bbbb9e23b700096ed7536':
  Bluetooth: Clear BLE always ON apps at Airplane mode
 2015-05-20 07:04:07 +00:00
Dongwon Kang
8989d34c2d am cf4f3d5c: TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams() 
* commit 'cf4f3d5c4cacd0cb350ad8fc7cbbe8b1df30feaa':
  TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
 2015-05-20 07:04:02 +00: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
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
d1e4c154b5 am 77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev 
* commit '77b01b887670b01f543558cd5cfd7d5d228d6c21':
  Close netlink socket when shutting down IpReachabilityMonitor
 2015-05-20 03:57:19 +00:00
Deepanshu Gupta
c85e2f22ac am 5a27e480: am 1c5bf7f1: Merge "Make Context.getClassLoader() work." into mnc-dev 
* commit '5a27e480d7480f9f050554ca5ee1448447945fe9':
  Make Context.getClassLoader() work.
 2015-05-20 03:28:53 +00:00
Erik Kline
77b01b8876 Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev 2015-05-20 03:26:14 +00:00
Deepanshu Gupta
5a27e480d7 am 1c5bf7f1: Merge "Make Context.getClassLoader() work." into mnc-dev 
* commit '1c5bf7f1ddc8c9c9844a1bc1a7e4ce53dcc5d5bd':
  Make Context.getClassLoader() work.
 2015-05-20 03:16:23 +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
6bbf31b23c am 38099fda: am f357c962: Merge "Prevent modification of system fixed permissions" into mnc-dev 
* commit '38099fda3b9492ac3cc95d5f80c4461c2344ac2a':
  Prevent modification of system fixed permissions
 2015-05-20 02:19:25 +00:00
Svetoslav
38099fda3b am f357c962: Merge "Prevent modification of system fixed permissions" into mnc-dev 
* commit 'f357c96273ad8c0f7acc0e15213cced2f0b21883':
  Prevent modification of system fixed permissions
 2015-05-20 02:06:10 +00:00
Svetoslav
f357c96273 Merge "Prevent modification of system fixed permissions" into mnc-dev 2015-05-20 01:57:44 +00:00
Simranjit Singh Kohli
2879d2741f am ca338578: am bdf2d1fa: Merge "[Fix Potential for error]:" into mnc-dev 
* commit 'ca3385787036144d371945dd4b63d7795f09eb34':
  [Fix Potential for error]:
 2015-05-20 01:26:33 +00:00
Simranjit Singh Kohli
ca33857870 am bdf2d1fa: Merge "[Fix Potential for error]:" into mnc-dev 
* commit 'bdf2d1fa382d4016087b2046beb871e9b3edb8df':
  [Fix Potential for error]:
 2015-05-20 01:16:54 +00:00
Simranjit Singh Kohli
bdf2d1fa38 Merge "[Fix Potential for error]:" into mnc-dev 2015-05-20 01:04:57 +00:00
Adrian Roos
03fc25df60 am 6a28532a: am 1bbe3d4b: Merge "Fix user switcher ripple emanation point" into mnc-dev 
* commit '6a28532a22c29feeca9f54630bd24b1aca9a9853':
  Fix user switcher ripple emanation point
 2015-05-20 01:02:51 +00:00
Christopher Tate
05aa799c1c am 0d6aeeb4: am f7a9aaa1: Merge "Rebind backup transports only when clearly needed" into mnc-dev 
* commit '0d6aeeb4eab3c90eeb2f9e3a2693c60103ccac48':
  Rebind backup transports only when clearly needed
 2015-05-20 00:56:48 +00:00
Adrian Roos
6a28532a22 am 1bbe3d4b: Merge "Fix user switcher ripple emanation point" into mnc-dev 
* commit '1bbe3d4b75f2ab4afe6344ee778058eaf530e3f5':
  Fix user switcher ripple emanation point
 2015-05-20 00:50:23 +00:00
Jean-Michel Trivi
cd50c5cf2e am 88f931bd: am 1705113e: Merge "API for converting AudioAttributes to stream type" into mnc-dev 
* commit '88f931bdd1f6e8175bb524501a0718e437a7eb25':
  API for converting AudioAttributes to stream type
 2015-05-20 00:47:47 +00:00
Svetoslav
a60e700cf8 am 0bb108a4: am 6d9a53ab: Merge "Handle downgrading a runtime permission to an install one" into mnc-dev 
* commit '0bb108a4a3ff65e1fea08ae0b3fd24bc187108c7':
  Handle downgrading a runtime permission to an install one
 2015-05-20 00:47:40 +00:00
Joe Fernandez
a192ffc0ff am c48f7d7e: am e56cce57: am 25a3b711: am 97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs 
* commit 'c48f7d7e89f8cf3f9a3eda8d5f36dfda9b7ca834':
  docs: M Preview - Updating image for Program Overview
 2015-05-20 00:47:20 +00: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
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
0d6aeeb4ea am f7a9aaa1: Merge "Rebind backup transports only when clearly needed" into mnc-dev 
* commit 'f7a9aaa12eb25bbd163fbc02c4fa638889dd67c2':
  Rebind backup transports only when clearly needed
 2015-05-20 00:16:11 +00:00