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

213723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
b1e7f6d287 Merge "Stop using 512 bit RSA keys in keyset unit tests." 
am: 59c9bfd41b

* commit '59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
  Stop using 512 bit RSA keys in keyset unit tests.
 2015-12-03 21:18:38 +00:00
Alex Klyubin
59c9bfd41b Merge "Stop using 512 bit RSA keys in keyset unit tests." 2015-12-03 21:10:46 +00:00
Christine Hallstrom
c1a79e7bd2 Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472 am: 67d068b5ec 
am: 9355a0420e

* commit '9355a0420e3324ae42ac1a5ca108730c5990dcbf':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:52:44 +00:00
Alex Klyubin
377e70ae9f Stop using 512 bit RSA keys in keyset unit tests. 
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.

Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
 2015-12-03 12:52:23 -08:00
Christine Hallstrom
9355a0420e Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472 
am: 67d068b5ec

* commit '67d068b5ec7ca3739047f0c5a162f9317171f784':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:42:35 +00:00
Christine Hallstrom
67d068b5ec Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev 
am: 7fb263c472

* commit '7fb263c472c9df98410b2b9dfe72e093e2d594e0':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:35:39 +00:00
Christine Hallstrom
7fb263c472 Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev 2015-12-03 20:32:05 +00:00
Andy Hung
b0545b6b1e DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 am: 94cefd6adb am: a30685ef8d 
am: ae4b789619

* commit 'ae4b7896195727dfd8d00b90f25074206bf21775':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:55:32 +00:00
Andy Hung
ae4b789619 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 am: 94cefd6adb 
am: a30685ef8d

* commit 'a30685ef8dcaa18b2561c17cfbbb48044adb2d27':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:50:25 +00:00
Andy Hung
a30685ef8d DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 
am: 94cefd6adb

* commit '94cefd6adb7cf464e4765faaba001071b543517b':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:42:45 +00:00
Andy Hung
94cefd6adb DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c 
am: 7c798c13a7

* commit '7c798c13a7c36f3c8877f410ecf5552e1b385805':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:34:01 +00:00
Andy Hung
7c798c13a7 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 
am: 0a887bcd5c

* commit '0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:24:02 +00:00
Yohei Yukawa
d42df4f68e Merge "Fix special handling of a fake language code "tl"." am: 9fd2af6b32 
am: 30e321b54a

* commit '30e321b54a589d33dc7f2dd7344bef95faaaf83d':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:18:45 +00:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"." 
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:10:30 +00:00
Christine Hallstrom
044b8f3f03 Log API calls to createBond(), cancelBondProcess(), removeBond() 
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.

Bug: 25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
 2015-12-03 19:08:17 +00:00
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +00:00
Christopher Wiley
d295e94dad Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517 
am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
 2015-12-03 17:54:08 +00:00
Christopher Wiley
4ff2cc0898 Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" 
am: 0ded0da517

* commit '0ded0da51743a24707bece4b0be05f49db3b9981':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
 2015-12-03 17:46:58 +00:00
Christopher Wiley
0ded0da517 Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException" 2015-12-03 17:43:43 +00:00
Jeff Sharkey
a9c2218940 Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b 
am: aae0a49c16

* commit 'aae0a49c164e9eeb19d46967c84697cd1a3a6783':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:16:30 +00:00
Jeff Sharkey
c32406e85b Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 
am: 67003be3f8

* commit '67003be3f8a53c1d11d130d53d866255bd04d2c7':
 2015-12-03 17:15:06 +00:00
Jeff Sharkey
5ee15f0be3 Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp 2015-12-03 17:14:11 +00:00
Jeff Sharkey
630f658108 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:13:43 +00:00
Jeff Sharkey
ead3f44aef Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:12:41 +00:00
Jeff Sharkey
28d8b8c988 Merge "Fix race condition when collecting op callback." am: 98844a97d2 
am: 678011854b

* commit '678011854b0969f5fe69d597911beabcadcb03e8':
  Fix race condition when collecting op callback.
 2015-12-03 17:11:22 +00:00
Jeff Sharkey
ec0e46fbc6 Merge "Improved variable naming" am: 4ef9d41066 
am: bc57510e9f

* commit 'bc57510e9f359929a55130d8a35c61a84dad4568':
  Improved variable naming
 2015-12-03 17:09:59 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider" 
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:07:50 +00:00
Jeff Sharkey
67003be3f8 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-12-03 17:06:57 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:06:24 +00:00
Jeff Sharkey
d5cefab28c Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:05:16 +00:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback." 
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
 2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming" 
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
 2015-12-03 17:02:21 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00
Jeff Sharkey
98844a97d2 Merge "Fix race condition when collecting op callback." 2015-12-03 16:58:34 +00:00
Jeff Sharkey
4ef9d41066 Merge "Improved variable naming" 2015-12-03 16:58:03 +00:00
Yohei Yukawa
ed65bc0c62 Fix special handling of a fake language code "tl". 
My previous CL 92280cd309b0f5967dd253280962d8581844db89 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.

  [1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5

With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string.  So far the only affected platfrom is API Level 23.

Bug: 20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
 2015-12-02 18:22:41 -08:00
Colin Cross
6b644ec528 Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e 
am: 38400b4696

* commit '38400b4696111d88b4fadb1fe99bdd05e40ba6be':
  Don't hardcode expected path to mainDexClasses
 2015-12-03 01:28:09 +00:00
Colin Cross
38400b4696 Merge "Don\'t hardcode expected path to mainDexClasses" 
am: be1613379e

* commit 'be1613379e4814e9c54901d6e0171841e68f60ab':
  Don't hardcode expected path to mainDexClasses
 2015-12-03 01:19:28 +00:00
Colin Cross
be1613379e Merge "Don't hardcode expected path to mainDexClasses" 2015-12-03 01:12:05 +00:00
Colin Cross
b4ff8e4815 Don't hardcode expected path to mainDexClasses 
Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.

Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1
 2015-12-02 16:24:08 -08:00
Andy Hung
0a887bcd5c DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
 2015-12-02 23:28:28 +00:00
Chris Elliott
a6ed5dcd04 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6 
am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
 2015-12-02 22:46:11 +00:00
Chris Elliott
087d30c142 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." 
am: 8e79dae3f6

* commit '8e79dae3f67aae032010ddbbef2f8032ace01263':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
 2015-12-02 21:57:06 +00:00
Chris Elliott
8e79dae3f6 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." 
This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.
 2015-12-02 13:16:46 -08:00
Robin Lee
5ec51457e1 Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c 
am: 427edbce96

* commit '427edbce965f62707a2a43d86d70d9d19f6c60dc':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED
 2015-12-02 12:47:59 +00:00
Robin Lee
427edbce96 Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" 
am: 3fe5a65b1c

* commit '3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED
 2015-12-02 12:41:20 +00:00
Robin Lee
3fe5a65b1c Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" 2015-12-02 12:35:14 +00:00
Adrian Roos
82cfaa813b Merge "Charging speed based on voltage" into mnc-dr2-dev 
am: 0ede75507c

* commit '0ede75507c43819d0417efe1f1ab5c626a608fc5':
  Charging speed based on voltage
 2015-12-02 01:50:10 +00:00
Adrian Roos
0ede75507c Merge "Charging speed based on voltage" into mnc-dr2-dev 2015-12-02 01:44:21 +00:00