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

206429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
0b638022b3 Check permissions on getDeviceId. 
This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I804e6613ce0de5f2c7ab832ae62aecf269a6d213
 2015-12-07 11:19:20 -08:00
Amit Mahajan
cd2cc9aa9b Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev 2015-12-07 18:15:38 +00:00
Julia Reynolds
dde5a6ef28 Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev 2015-12-07 15:06:03 +00:00
Julia Reynolds
3e57340b6a Fix radio button flash on hour change. 
Also delete confusing debug variable.

Bug: 25459795
Bug: 25783349
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
 2015-12-07 14:59:16 +00:00
Eino-Ville Talvala
e2d516fd4b Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 
am: 7417f70ac6

* commit '7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
  Camera: codegen doc update
 2015-12-04 16:20:47 -08:00
Eino-Ville Talvala
7417f70ac6 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d 
am: add4b91d41

* commit 'add4b91d41d3ba810b6b25c14d7c13050394f201':
  Camera: codegen doc update
 2015-12-05 00:11:43 +00:00
Eino-Ville Talvala
add4b91d41 Merge "Camera: codegen doc update" into mnc-dev 
am: 69c5e7143d

* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
  Camera: codegen doc update
 2015-12-04 16:03:23 -08:00
Robert Greenwalt
9887f2f50a Protect some new broadcasts. 
DEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected,
allowing 3rd parties to potentially spoof the bcasts feeding misinformation
to system listeners.

bug:25778215
Change-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5
 2015-12-04 15:54:53 -08:00
Eino-Ville Talvala
69c5e7143d Merge "Camera: codegen doc update" into mnc-dev 2015-12-04 23:54:05 +00:00
Chenjie Luo
90bc39d7e3 Check NPE beforehand instead of catching it at runtime 
This will fix the page fault when watch rings during incoming call

Bug: 25904666
Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
 2015-12-03 14:58:01 -08:00
Vineeta Srivastava
9eacc97d71 Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev 2015-12-03 21:56:29 +00:00
Hyejin Kim
47268e974e Set Tether APN protocol type to IPv4 for Telus 
BUG=25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
 2015-12-03 13:35:06 -08: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
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
8e79dae3f6 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." 
This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.
 2015-12-02 13:16:46 -08: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
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
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
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
Yin-Chia Yeh
5fdf0a1af0 Camera: codegen doc update 
Bug: 25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
 2015-11-30 14:25:37 -08: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
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
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
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
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
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
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
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
Geoff Mendal
1bd58bfd5b Import translations. DO NOT MERGE am: bddde9b83d -s ours 
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE
 2015-11-20 01:25:11 +00:00
Geoff Mendal
d0709c3a32 Import translations. DO NOT MERGE 
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE
 2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
 2015-11-20 01:07:33 +00:00
Deepanshu Gupta
2d887558df Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev 
am: 35f7562495

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-19 21:00:17 +00:00
Deepanshu Gupta
867c370465 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 
am: 8c971ae5a0

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-19 20:58:52 +00:00