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

206502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
531eb5b484 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:34:26 +00:00
Geoff Mendal
d8004c03d2 Import translations. DO NOT MERGE 
am: 22dea4e16f  -s ours

* commit '22dea4e16f9a32eb4693829b59462c32dda3f45c':
  Import translations. DO NOT MERGE
 2015-12-15 20:33:27 -08:00
Geoff Mendal
d2615bdf40 Import translations. DO NOT MERGE 
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
 2015-12-15 20:29:48 -08:00
Geoff Mendal
327d917865 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:26:04 +00:00
Geoff Mendal
695cf968b7 Import translations. DO NOT MERGE 
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
 2015-12-15 20:21:26 -08:00
Geoff Mendal
22dea4e16f Import translations. DO NOT MERGE 
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
 2015-12-15 20:18:32 -08:00
Adam Lesinski
1d6d4c5a69 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev 2015-12-15 23:52:43 +00:00
Adam Lesinski
5f8c8186ec DO NOT MERGE: 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
(cherry picked from commit 6902052c77bbcb9078b4ced243874f67542f64f9)
 2015-12-15 22:12:10 +00:00
Adam Lesinski
9289560aa0 Use wakeup reason when FingerPrint sensor wakes up the device 
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.

Bug:26209577
Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
(cherry picked from commit 5bcb8bb31ab6688dff432cb7bd20fe69016c7003)
 2015-12-15 21:46:11 +00:00
Bryce Lee
36393a5674 Allow access to deprecated LOCK_PATTERN_ENABLED flag. 
am: 4614596a39

* commit '4614596a395b6c86fff3f35a07edda2e848d743c':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
 2015-12-14 23:43:54 +00:00
Bryce Lee
4614596a39 Allow access to deprecated LOCK_PATTERN_ENABLED flag. 
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.

Bug: 26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
 2015-12-14 14:39:10 -08:00
Ian Pedowitz
cf07154e71 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev 2015-12-12 01:06:43 +00:00
Dan Sandler
ddb52fb1f5 DO NOT MERGE Remove more extras during notification lightening. 
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.

Cherry-picked from 5012853de26eac023deda82d138a35677fe6117b

Bug: 26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
 2015-12-12 01:05:25 +00:00
Christopher Tate
a89f9d93cb Don't back up / restore EAP network definitions 
Bug 25725016

Cherrypick from AOSP.

Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
 2015-12-10 18:23:22 -08:00
Dianne Hackborn
022c748f54 Work on issue #25467052: System lagged out 
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.

Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
 2015-12-10 15:14:46 -08:00
Adam Lesinski
ba88e68fe4 Prevent DivideByZero error in BatteryStatsImpl 
It was assumed that when a UID had either rx or tx bytes/packets that it would
have the other as well.

Bug:25706750
Change-Id: Iefac59a6bd02876aed9a0bac218d187b81807a95
 2015-12-10 00:48:24 +00:00
Bryce Lee
180dd72a9b Improve logging in BluetoothHeadsetClientCall. 
am: 3c67873f0a

* commit '3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
  Improve logging in BluetoothHeadsetClientCall.
 2015-12-09 22:54:19 +00:00
Bryce Lee
3c67873f0a Improve logging in BluetoothHeadsetClientCall. 
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
 2015-12-08 11:22:31 -08:00
Prashant Malani
6344cb8144 Merge "Add rotary encoder input source" into cw-e-dev 
am: 487f0d3d15

* commit '487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
  Add rotary encoder input source
 2015-12-08 01:31:31 +00:00
Prashant Malani
487f0d3d15 Merge "Add rotary encoder input source" into cw-e-dev 2015-12-08 01:27:18 +00:00
Chenjie Luo
bef0525c38 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev 
am: e56f7b0d1d

* commit 'e56f7b0d1d92390c3409999ea841525514163f65':
  Check NPE beforehand instead of catching it at runtime
 2015-12-07 23:06:36 +00:00
Chenjie Luo
e56f7b0d1d Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev 2015-12-07 21:04:14 +00:00
Robert Greenwalt
d8231b9f37 Check permissions on getDeviceId. 
This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
 2015-12-07 12:38:48 -08:00
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