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

214285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
a849f1e430 Merge changes from topic \'sni\' 
am: c76789d35a

* commit 'c76789d35a7ca92c0b334cc6cf4a44a0044b2a44':
  Track libcore change
  Track libcore change
 2016-02-01 11:05:01 +00:00
Kenny Root
c76789d35a Merge changes from topic 'sni' 
* changes:
  Track libcore change
  Track libcore change
 2016-02-01 10:58:14 +00:00
Kenny Root
779efda769 Track libcore change 
This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.

Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273
 2016-02-01 02:55:34 -08:00
Kenny Root
542349a995 Track libcore change 
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.

Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
 2016-02-01 02:55:17 -08:00
Stephen Hines
c033f493f2 Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API." 
am: 49aee686d8

* commit '49aee686d8c1c888fd0dd2778c19d5968dae0252':
  Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API.
 2016-01-30 17:52:28 +00:00
Stephen Hines
49aee686d8 Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API." 2016-01-30 17:44:52 +00:00
Neil Fuller
833c9fcdf1 Merge "Unhide @Repeatable" 
am: 31312ecfd2

* commit '31312ecfd2b701c6b9fdc34156e8a12df3022c25':
  Unhide @Repeatable
 2016-01-29 16:28:22 +00:00
Neil Fuller
31312ecfd2 Merge "Unhide @Repeatable" 2016-01-29 16:19:36 +00:00
Neil Fuller
79bd8e8815 Merge "Unhide @FunctionalInterface" 
am: 45a1ea33a4

* commit '45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
  Unhide @FunctionalInterface
 2016-01-29 16:18:32 +00:00
Neil Fuller
6fa925a76c Unhide @Repeatable 
Bug: 26623636
(cherry-picked from commit c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)

Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
 2016-01-29 16:17:31 +00:00
Neil Fuller
45a1ea33a4 Merge "Unhide @FunctionalInterface" 2016-01-29 16:10:13 +00:00
Neil Fuller
679e4037f2 Unhide @FunctionalInterface 
Bug: 26623636
(cherry-picked from commit c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
 2016-01-29 16:07:43 +00:00
Neil Fuller
796da66012 Merge "Unhide Method.isDefault" 
am: b05fa3e841

* commit 'b05fa3e841c37ae8089cf3cffc28439ced56884b':
  Unhide Method.isDefault
 2016-01-29 15:40:21 +00:00
Neil Fuller
b05fa3e841 Merge "Unhide Method.isDefault" 2016-01-29 15:31:38 +00:00
Neil Fuller
d2d0765e8d Unhide Method.isDefault 
Bug: 26623636
(cherry-picked from commit 20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
 2016-01-29 15:30:06 +00:00
Adam Lesinski
5142a2d5b3 Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev am: c46f6db46e 
am: 9548f85d9d

* commit '9548f85d9dc4207c3d1a3eed51f98131f8210c5f':
  Don't change screen on time on time changes
 2016-01-28 19:30:10 +00:00
Adam Lesinski
9548f85d9d Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev 
am: c46f6db46e

* commit 'c46f6db46ed5474fbe8312a1229b59debbbae994':
  Don't change screen on time on time changes
 2016-01-28 19:24:44 +00:00
Adam Lesinski
c46f6db46e Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev 2016-01-28 19:20:50 +00:00
Pavlin Radoslavov
dc84cff34f Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user" 
am: 26fdbc1833

* commit '26fdbc18337a8e9d16e18255e39ce7a16e83d57b':
  Grant CAP_WAKE_ALARM to the Bluetooth process for any user
 2016-01-28 02:12:42 +00:00
Adam Lesinski
b2d3ffaa20 Don't change screen on time on time changes 
Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
 2016-01-27 17:51:47 -08:00
Joe LaPenna
ab00e4e38c [DO NOT MERGE ANYWHERE]: Allow button events in ambient. am: 7528f57c4d -s ours am: 2bccc45cec -s ours 
am: b47972df80  -s ours

* commit 'b47972df80ffa40c4ea8541f96275c25ed939d7b':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.
 2016-01-28 01:17:24 +00:00
Joe LaPenna
b47972df80 [DO NOT MERGE ANYWHERE]: Allow button events in ambient. am: 7528f57c4d -s ours 
am: 2bccc45cec  -s ours

* commit '2bccc45cec5201c5b613134ebb0b398bc45483ef':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.
 2016-01-28 01:12:36 +00:00
Joe LaPenna
2bccc45cec [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
am: 7528f57c4d  -s ours

* commit '7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.
 2016-01-28 01:06:28 +00:00
Pavlin Radoslavov
26fdbc1833 Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user" 2016-01-28 00:52:41 +00:00
Pavlin Radoslavov
2956beeec9 Grant CAP_WAKE_ALARM to the Bluetooth process for any user 
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.

Bug: 26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
 2016-01-27 16:22:15 -08:00
Joe LaPenna
7528f57c4d [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
See thread: "key presses & Ambient"

BUG: 25964771
BUG: 26524301

Change-Id: I914edd447c38678a06d27677be4597c0ee384635
 2016-01-27 14:19:44 -08:00
Miao Wang
d90b4a3266 Merge "[RenderScript] Implement APIs for better multi-frame process support." 
am: 6ebdbfa549

* commit '6ebdbfa5498c486a96f2b8b07858eb1a25a6d08a':
  [RenderScript] Implement APIs for better multi-frame process support.
 2016-01-27 21:43:27 +00:00
Miao Wang
6ebdbfa549 Merge "[RenderScript] Implement APIs for better multi-frame process support." 2016-01-27 21:30:00 +00:00
Marie Janssen
f3c5230bf3 Merge "IBluetooth: remove dump(), support arguments" 
am: d63847a866

* commit 'd63847a86680df271cc518a6baaac30a7e07c9f5':
  IBluetooth: remove dump(), support arguments
 2016-01-27 20:49:55 +00:00
Marie Janssen
d63847a866 Merge "IBluetooth: remove dump(), support arguments" 2016-01-27 20:42:07 +00:00
Przemyslaw Szczepaniak
2a30579c2e Merge "Remove java.nio.file package" 
am: 804e1e8c15

* commit '804e1e8c152e46e7c3b47a0e73b4dabd83ba7dcf':
  Remove java.nio.file package
 2016-01-27 15:11:51 +00:00
Przemyslaw Szczepaniak
804e1e8c15 Merge "Remove java.nio.file package" 2016-01-27 15:03:39 +00:00
Przemyslaw Szczepaniak
b1819b4eb2 Remove java.nio.file package 
This package has no test coverage, and we don't
know if it was ported properly. This package will
be added in future, with a test suite.

Bug: 26786186
Change-Id: I1bd7989837040da06cd914d366e9674d6b36fe86
 2016-01-27 11:14:53 +00:00
Miao Wang
8c1509249c [RenderScript] Implement APIs for better multi-frame process support. 
Bug: 23535524

 Two APIs added for multiframe processing:
 - createAllocations(...): To create an array of Allocations sharing the
   same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
   the same BufferQueue.
 - getTimeStamp(): API to retrieve the time stamp associated with the
   most recent buffer.

Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
 2016-01-26 14:40:44 -08:00
Nick Vaccaro
cee0600bd9 Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours am: 3e413dfcdd -s ours 
am: f5958497d3  -s ours

* commit 'f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
 2016-01-26 20:34:20 +00:00
Nick Vaccaro
f5958497d3 Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours 
am: 3e413dfcdd  -s ours

* commit '3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
 2016-01-26 20:21:37 +00:00
Nick Vaccaro
3e413dfcdd Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 
am: 907108ca0f  -s ours

* commit '907108ca0f4e69dd170a507c5830591712ec5967':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
 2016-01-26 20:16:15 +00:00
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