drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
214,298 Commits 1 Branch 0 Tags
Commit Graph

214298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Vaccaro
907108ca0f Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 2016-01-26 20:13:26 +00:00
Peng Xu
79c004b2c1 [DO NOT MERGE ANYWHERE] Fix bodysensor permission 
Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
 2016-01-26 20:10:27 +00:00
Przemyslaw Szczepaniak
04785955b5 Merge "Fix incorrect @hide usage in libcore" 
am: 1f3aaf82cb

* commit '1f3aaf82cba11c55abc25b551e28344f04a1524a':
  Fix incorrect @hide usage in libcore
 2016-01-26 10:47:44 +00:00
Przemyslaw Szczepaniak
1f3aaf82cb Merge "Fix incorrect @hide usage in libcore" 2016-01-26 10:37:47 +00:00
Przemyslaw Szczepaniak
02027ff589 Fix incorrect @hide usage in libcore 
@hide annotation is only effective in Javadoc.

Bug: 26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
 2016-01-26 10:35:22 +00:00
Wei Liu
21e0927b47 Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031 
am: a12d383117

* commit 'a12d3831178616a171382f1546812c26245af2d0':
  Add a null check before reference networkInfo.
 2016-01-26 03:06:09 +00:00
Wei Liu
a12d383117 Add a null check before reference networkInfo. am: b8eaf45e1d 
am: dca8f10031

* commit 'dca8f10031f33c7c85577fa1abcc26d560c90388':
  Add a null check before reference networkInfo.
 2016-01-26 01:57:31 +00:00
Wei Liu
dca8f10031 Add a null check before reference networkInfo. 
am: b8eaf45e1d

* commit 'b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
  Add a null check before reference networkInfo.
 2016-01-26 01:52:12 +00:00
Miao Wang
5f210ae042 Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" 
am: ed50f333fb

* commit 'ed50f333fb28905f085473d3150f906f0106295a':
  [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
 2016-01-26 01:21:51 +00:00
Miao Wang
ed50f333fb Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" 2016-01-26 01:11:41 +00:00
Miao Wang
0facf021ea [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer 
Bug: 25926361
Bug: 23535524

  - Construct the ByteBuffer using the AllocationGetPointer.
  - Add an API to query the stride of the allocation.
  - Both ByteBuffer and Stride will be cached for normal Allocations.
    if using USAGE_IO, since after each ioReceive, the mallocPtr will
    change, getByteBuffer will always create a new one using the most
    up-to-date mallocPtr.

Change-Id: I5e84b6690e83bb062c383043275524d0e51e46eb
 2016-01-25 16:12:37 -08:00
Wei Liu
b8eaf45e1d Add a null check before reference networkInfo. 
b/26758858

Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
 2016-01-25 10:34:27 -08:00
Dimitry Ivanov
e057ed6b6b Merge "Remove path to the apk from the permittedPath" 
am: 5194d217b8

* commit '5194d217b81f7375f4d60c35b604bac8bffc51e7':
  Remove path to the apk from the permittedPath
 2016-01-25 18:16:44 +00:00
Chad Brubaker
8500093a35 Merge "Add getApplicationConfigForPackage" 
am: 7519dce8c2

* commit '7519dce8c2742b8abcc884a930552c8372b777fd':
  Add getApplicationConfigForPackage
 2016-01-25 18:14:39 +00:00
Dimitry Ivanov
5194d217b8 Merge "Remove path to the apk from the permittedPath" 2016-01-25 18:04:18 +00:00
Chad Brubaker
7519dce8c2 Merge "Add getApplicationConfigForPackage" 2016-01-25 18:03:13 +00:00
Martijn Coenen
cf2f9d0966 Merge "Implementation of HCE for NFC-F." 
am: e168012ff2

* commit 'e168012ff21408f8be85040bb4ac977061519f62':
  Implementation of HCE for NFC-F.
 2016-01-25 09:56:20 +00:00
Martijn Coenen
e168012ff2 Merge "Implementation of HCE for NFC-F." 2016-01-25 09:48:43 +00:00
Chad Brubaker
056e8b5a5a Add getApplicationConfigForPackage 
This allows services which make network connections on behalf of
applications to honor the application's network security policy.

Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
 2016-01-22 22:04:20 -08:00
Jorim Jaggi
5d6da4eab0 Merge "NullPointerException when starting VoiceInteractionManagerService" 
am: b7fbe1104f

* commit 'b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
  NullPointerException when starting VoiceInteractionManagerService
 2016-01-23 02:18:13 +00:00
Jorim Jaggi
b7fbe1104f Merge "NullPointerException when starting VoiceInteractionManagerService" 2016-01-23 02:09:36 +00:00
Deepanshu Gupta
08f736e7b1 Merge "Remove GregorianCalendar hack" 
am: 187c022bf1

* commit '187c022bf187f137d48d9031c43cfc233c9fc158':
  Remove GregorianCalendar hack
 2016-01-23 00:02:05 +00:00
Deepanshu Gupta
187c022bf1 Merge "Remove GregorianCalendar hack" 2016-01-22 23:53:07 +00:00
Thierry Strudel
afbf1570ac Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 
am: e8b476e8e8

* commit 'e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:28:41 +00:00
Thierry Strudel
e8b476e8e8 Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev 
am: 0064c4c793

* commit '0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:20:30 +00:00
Thierry Strudel
0064c4c793 Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev 2016-01-22 22:07:32 +00:00
Dimitry Ivanov
ee5a181371 Remove path to the apk from the permittedPath 
Bug: http://b/26732624
Bug: http://b/22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
 2016-01-22 13:20:29 -08:00
Amith Yamasani
375901244c Check apps idle states on time changes am: c465e71cdc 
am: d4bd4cb4b1

* commit 'd4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
  Check apps idle states on time changes
 2016-01-22 20:58:46 +00:00
Amith Yamasani
d4bd4cb4b1 Check apps idle states on time changes 
am: c465e71cdc

* commit 'c465e71cdc401e1565c29a895a5c6d366ba5344c':
  Check apps idle states on time changes
 2016-01-22 20:51:34 +00:00
Deepanshu Gupta
4f3d0c6caa Remove GregorianCalendar hack 
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
 2016-01-22 11:33:53 -08:00
Amith Yamasani
c465e71cdc Check apps idle states on time changes 
And ensure that the listeners are informed of app standby transitions
that might occur during time changes.

Fix for apps that sometimes don't have network access until reboot.

Bug: 26488100
Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
 2016-01-22 11:27:16 -08:00
David Gross
ce9c9b7bce Merge "Add general reduction plumbing starting with Java Script::reduce()." 
am: fca558c549

* commit 'fca558c5490e319448ce69d1f526f5a446bb3045':
  Add general reduction plumbing starting with Java Script::reduce().
 2016-01-22 17:07:59 +00:00
David Gross
fca558c549 Merge "Add general reduction plumbing starting with Java Script::reduce()." 2016-01-22 17:00:43 +00:00
Yoshinobu Ito
c52adfe124 Implementation of HCE for NFC-F. 
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.

Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
               Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>

Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
 2016-01-22 18:14:18 +09:00
Thierry Strudel
b786aaa5a7 Don't assume kernel tick is 100Hz 
Bug: 26729731
Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
 2016-01-21 16:31:21 -08:00
Lorenzo Colitti
af0c4d0c7e Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev am: a6855a1faa 
am: d841d71593

* commit 'd841d71593c0c4a7c5beaf5196a22d9158c2d697':
  Debug logging for when getActiveNetworkInfo returns BLOCKED.
 2016-01-22 00:14:27 +00:00
Bryce Lee
c248f6c7ad Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am: 2e7ecddd5b -s ours am: 746ea1efe3 -s ours 
am: b2f0e7f6bc  -s ours

* commit 'b2f0e7f6bc24914b90a2673b5e8527468de48071':
  DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
 2016-01-21 23:55:53 +00:00
Marie Janssen
0c04ccd952 IBluetooth: remove dump(), support arguments 
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().

Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
 2016-01-21 23:53:37 +00:00
Lorenzo Colitti
d841d71593 Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev 
am: a6855a1faa

* commit 'a6855a1faa898da0f4a4fdc45485dc1f4182497b':
  Debug logging for when getActiveNetworkInfo returns BLOCKED.
 2016-01-21 23:51:16 +00:00
Lorenzo Colitti
a6855a1faa Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev 2016-01-21 23:31:50 +00:00
Bryce Lee
b2f0e7f6bc Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am: 2e7ecddd5b -s ours 
am: 746ea1efe3  -s ours

* commit '746ea1efe3e2acc13865f731f3b5a7cc88525c1d':
  DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
 2016-01-21 23:30:48 +00:00
Robert Greenwalt
bd92c57a4f Merge "Add free short codes for Direct Carrier Billing and others." 
am: 4d9ffdf952

* commit '4d9ffdf95237c4ee59514c678fea6ff157e0eee3':
  Add free short codes for Direct Carrier Billing and others.
 2016-01-21 23:20:02 +00:00
Bryce Lee
746ea1efe3 Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev 
am: 2e7ecddd5b  -s ours

* commit '2e7ecddd5bb13721e5b3d55ee96b9dcf2e9148e6':
  DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
 2016-01-21 23:19:06 +00:00
Bryce Lee
2e7ecddd5b Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev 2016-01-21 23:01:06 +00:00
Bryce Lee
fe985fa7f0 DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall. 
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
 2016-01-21 22:54:56 +00:00
Robert Greenwalt
4d9ffdf952 Merge "Add free short codes for Direct Carrier Billing and others." 2016-01-21 22:10:55 +00:00
John Reck
32a95af029 Merge "libhwui: fix texture memory leak" 
am: 550d46d9da

* commit '550d46d9dae8a4de5abd36a5e2d3c101135da696':
  libhwui: fix texture memory leak
 2016-01-21 22:08:44 +00:00
John Reck
550d46d9da Merge "libhwui: fix texture memory leak" 2016-01-21 21:48:24 +00:00
Lorenzo Colitti
c1a6ce70be Debug logging for when getActiveNetworkInfo returns BLOCKED. 
Bug: 26488100
Change-Id: I991581732d35aed18392bed2f3d69ca8fb231f5e
 2016-01-22 05:21:34 +09:00
Matthew Williams
caf53acdd7 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e am: c151cec56e am: 4831ef3872 
am: d877135d61

* commit 'd877135d616321b4b3013b302e8615a8f8b04ffa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:25:51 +00:00