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

206311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Adrian Roos
0ede75507c Merge "Charging speed based on voltage" into mnc-dr2-dev 2015-12-02 01:44:21 +00:00
Ben Fennema
ceec3dab7c Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0 -s ours 
am: 8780f07b5c  -s ours

* commit '8780f07b5c2a318cb28c172f9eac47b975793c90':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
 2015-12-02 01:20:15 +00:00
Ben Fennema
8780f07b5c Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev 
am: 4d70e6a3c0  -s ours

* commit '4d70e6a3c044c4e29d84835a026b3e70b44b66e8':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
 2015-12-02 01:12:04 +00:00
Ben Fennema
4d70e6a3c0 Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev 2015-12-02 01:06:12 +00:00
Ben Fennema
e9970bc981 Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" 
This reverts commit ad75169628589a275fb869a813ea697336e0c0aa.

Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
 2015-12-02 01:05:25 +00:00
Ben Fennema
e90efd9153 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733 -s ours 
am: b98383291f  -s ours

* commit 'b98383291f32d0152cb291855aa00f016d526a4a':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data
 2015-12-02 00:34:14 +00:00
Ben Fennema
b98383291f Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev 
am: ec7180f733  -s ours

* commit 'ec7180f7333777582e642fc54f7106d500b7da33':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data
 2015-12-02 00:26:19 +00:00
Ben Fennema
ec7180f733 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev 2015-12-02 00:01:55 +00:00
Chris Elliott
767e2b39db Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 
am: c54aa0c3f7

* commit 'c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
  MediaPlayer: Disable acquiring wakelocks based on property.
 2015-12-01 21:27:33 +00:00
Chris Elliott
c54aa0c3f7 Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev 
am: 50276adde2

* commit '50276adde24c55394c0023ef49d01f054303dc87':
  MediaPlayer: Disable acquiring wakelocks based on property.
 2015-12-01 21:19:54 +00:00
Chris Elliott
50276adde2 Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev 2015-12-01 21:12:15 +00:00
Bryce Lee
8f95fe4b71 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours 
am: 4ecf963e77  -s ours

* commit '4ecf963e770e0226c3fcef509ff5d7fb6c31ed0b':
  DO NOT MERGE ANYWHERE
 2015-12-01 15:50:14 +00:00
Bryce Lee
4ecf963e77 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev 
am: 085796bdf5  -s ours

* commit '085796bdf5e106abd42db2d0ef7d3aee899a766b':
  DO NOT MERGE ANYWHERE
 2015-12-01 15:43:15 +00:00
Bryce Lee
085796bdf5 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev 2015-12-01 15:37:30 +00:00
Jani Suonpera
ad75169628 DO NOT MERGE ANYWHERE Add new interface for sensor physical data 
This is special solution only for emerald branch.

Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.

Change-Id: Id19226d7d3ac0628488a0f005f2b1c44bafcf9b6
Signed-off-by: Ben Fennema <fennema@google.com>
 2015-11-30 21:24:48 -08:00
Bryce Lee
64e41590d2 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 
am: b241487c16

* commit 'b241487c16976a3f0aa6592740bba15f489eab17':
  Add callback for connections to be notified when the ringer is silenced.
 2015-11-30 19:02:38 +00:00
Bryce Lee
b241487c16 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev 
am: 52bdf11583

* commit '52bdf11583366322ca14d69b895ac451a71245db':
  Add callback for connections to be notified when the ringer is silenced.
 2015-11-30 18:56:27 +00:00
Bryce Lee
52bdf11583 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev 2015-11-30 18:51:39 +00:00
Erik Wolsheimer
1d92c4538f fix data race condition BUG: 25819358 am: 2242b4d2bd 
am: 1dbb0355dc

* commit '1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
  fix data race condition BUG: 25819358
 2015-11-30 17:28:44 +00:00
Erik Wolsheimer
1dbb0355dc fix data race condition BUG: 25819358 
am: 2242b4d2bd

* commit '2242b4d2bda7f83cf7813103ff95d9b4e244126f':
  fix data race condition BUG: 25819358
 2015-11-30 17:22:56 +00:00
Erik Wolsheimer
2242b4d2bd fix data race condition 
BUG: 25819358

Change-Id: I9d9978c92d084e93ccb41ea1d0fe33ffe3e17e3d
 2015-11-24 13:22:04 -08:00
Kevin Neas
32a7d85f64 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 
am: b6ae32162e

* commit 'b6ae32162e77d9f11620b6806dec20a0987e2dab':
  DO NOT MERGE. Cherrypick UiBench from Master
 2015-11-24 02:46:24 +00:00
Kevin Neas
b6ae32162e Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev 
am: 4dbb586585

* commit '4dbb58658552d1cdae46ef06d331b867f5610786':
  DO NOT MERGE. Cherrypick UiBench from Master
 2015-11-24 01:58:00 +00:00
Adrian Roos
0c859ae9c7 Charging speed based on voltage 
Also takes into account the voltage
at which we charge to make speeds
at different voltages comparable.

Bug: 25229483
Change-Id: I62a192932a013036585cd9fc870808debceac0d3
 2015-11-23 17:36:06 -08:00
Kevin Neas
4dbb586585 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev 2015-11-24 00:50:18 +00:00
Sridhar Vashist
f60491183d MediaPlayer: Disable acquiring wakelocks based on property. 
Ignore setWakeMode based on system property.
Wakelocks essential for playback will be held by audioflinger.

Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
 2015-11-23 14:09:25 -08:00
Geoff Mendal
d273c053ce Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2015-11-23 17:51:14 +00:00
Geoff Mendal
fa49e87f5e Import translations. DO NOT MERGE 
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
 2015-11-23 18:50:05 +01:00
Geoff Mendal
57b3e7508d Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: ae7c51a9cc  -s ours

* commit 'ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
  Import translations. DO NOT MERGE
 2015-11-23 17:38:52 +00:00
Geoff Mendal
ae7c51a9cc Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2015-11-23 17:32:02 +00:00
Geoff Mendal
2542f81bb1 Import translations. DO NOT MERGE 
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
 2015-11-23 18:30:39 +01:00
Geoff Mendal
816a167b29 Import translations. DO NOT MERGE am: b21b778567 -s ours 
am: b96f640a77  -s ours

* commit 'b96f640a77b0c09868e104028d3bb9db3687018b':
  Import translations. DO NOT MERGE
 2015-11-23 13:43:48 +00:00
Geoff Mendal
b96f640a77 Import translations. DO NOT MERGE 
am: b21b778567  -s ours

* commit 'b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
  Import translations. DO NOT MERGE
 2015-11-23 13:36:02 +00:00
Geoff Mendal
b21b778567 Import translations. DO NOT MERGE 
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
 2015-11-23 14:26:59 +01:00
Adam Lesinski
29db6ccb72 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours 
am: 888916ff0f  -s ours

* commit '888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:20:14 +00:00
Adam Lesinski
888916ff0f DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
am: 6902052c77  -s ours

* commit '6902052c77bbcb9078b4ced243874f67542f64f9':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:14:08 +00:00
Adam Lesinski
6902052c77 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.

Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
 2015-11-20 10:58:02 -08:00
Geoff Mendal
b1a5fef946 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours 
am: fd773d1ba7  -s ours

* commit 'fd773d1ba76c29b8888c71906ef44ec09a551627':
  Import translations. DO NOT MERGE
 2015-11-20 01:40:42 +00:00
Geoff Mendal
fd773d1ba7 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours 
am: 1bd58bfd5b  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE
 2015-11-20 01:30:35 +00:00