summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | logd: prune 10% or 256 entries maxMark Salyzyn2015-08-201-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit b39ed0c9925356c74a6347630b04d875288d803b) Bug: 22351810 Bug: 23327476 Change-Id: I902ba6b431d8b7cee2d65ee2f76e9f7c4f30b152
| * | | | | | | | logd: sizes > 1M prune in smaller batchesMark Salyzyn2015-08-201-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 62ab0fd4efeed313adf2fdf84167d754620c0ad1) Switch to 1% batch sizes from 10% when individual buffer size > 1M Bug: 22351810 Change-Id: Ifee570a54643ceb0ba767e1787e937f70cc90b72
* | | | | | | | | am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am ↵Abhishek Arya2015-08-211-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit '219a006f89a5448a9a6eeb1f37ad0088e85bd3f8': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| * | | | | | | | am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am ↵Abhishek Arya2015-08-211-0/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | * | | | | | | am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile ↵Abhishek Arya2015-08-211-0/+3
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit 'e45d96d6bf592f0ae20bb021ea529acc94e0cb55': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | | * | | | | | am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure ↵Abhishek Arya2015-08-211-0/+3
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit '19398a712c53d27aaa2122cfae5d54168b8df0c9': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | | | * | | | | am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after ↵Abhishek Arya2015-08-211-0/+3
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit 'd34846b70b7f6eb167722d45e0c717fa64116e90': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | | | | * | | | am cd407a17: am e0dce90b: Fix compile failure after ↵Abhishek Arya2015-08-211-0/+3
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | | | | | * | | am e0dce90b: Fix compile failure after ↵Abhishek Arya2015-08-211-0/+3
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rIfe1dc0791040150132bea6884f1e6c8d31972d1b * commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb': Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
| | | | | | | * | Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1bAbhishek Arya2015-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23290056 Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
* | | | | | | | | am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am ↵Sergio Giro2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 * commit '3fa8b550eadeef21e2ca996c44e37f84b1418f95': libutils: fix overflow in String8::allocFromUTF8
| * | | | | | | | am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am ↵Sergio Giro2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 * commit '93f106b8d0207ce685ad56704df8a568f3edebb6': libutils: fix overflow in String8::allocFromUTF8
| | * | | | | | | am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: ↵Sergio Giro2015-08-201-0/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix overflow in String8::allocFromUTF8 * commit 'e97682be0634fe773f70097bc518e5d034efe8f7': libutils: fix overflow in String8::allocFromUTF8
| | | * | | | | | am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow ↵Sergio Giro2015-08-201-0/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in String8::allocFromUTF8 * commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977': libutils: fix overflow in String8::allocFromUTF8
| | | | * | | | | am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in ↵Sergio Giro2015-08-201-0/+3
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String8::allocFromUTF8 * commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4': libutils: fix overflow in String8::allocFromUTF8
| | | | | * | | | am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-201-0/+3
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0': libutils: fix overflow in String8::allocFromUTF8
| | | | | | * | | am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-201-0/+3
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b85b1d40d619c2064d321364f212ebfeb6ba185': libutils: fix overflow in String8::allocFromUTF8
| | | | | | | * | libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch contributed in: https://code.google.com/p/android/issues/detail?id=182908 Bug: 23290056 (cherry picked from commit 4eeacbeec0ae66e9d9395abbf83666709f2e11e3) Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b (cherry picked from commit ebabef275283f771151ec93c17469374b789b2c8)
* | | | | | | | | am e0ab2322: Display the map offset for each frame.Christopher Ferris2015-08-202-0/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | * commit 'e0ab23223a1c3110c9550136b8a119b4c30ec066': Display the map offset for each frame.
| * | | | | | | Display the map offset for each frame.Christopher Ferris2015-08-202-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dlopen of a shared library in an apk results in large map offsets. Unfortunately, the current way that the frame data is printed, it's impossible to tell what the relative pc is relative to. With the addition of the offset, it's possible to figure out what the relative pc actually references. Bug: 23348999 Change-Id: Ia51b669ea3f810158cfd0d71d9ae89bf9a3170d3
* | | | | | | | Merge "Use init to write usb typec props" into mnc-dr-devTim Kilbourn2015-08-181-0/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Use init to write usb typec propsTim Kilbourn2015-08-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sysfs nodes are owned by root, so use init to write role changes. Bug: 21615151 Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
* | | | | | | | | am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into ↵Sergio Giro2015-08-181-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9': libutils: fix overflow in String8::allocFromUTF8
| * | | | | | | Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-devSergio Giro2015-08-181-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch contributed in: https://code.google.com/p/android/issues/detail?id=182908 Bug: 23290056 (cherry picked from commit 4eeacbeec0ae66e9d9395abbf83666709f2e11e3) Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
* | | | | | | | | am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into ↵Andres Morales2015-08-064-2/+125
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '19f223f3cfe43a4ded903a5d6a5f07bbadf115f5': [gatekeeperd] Check parent profile for SID lookups
| * | | | | | | | Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-devAndres Morales2015-08-064-2/+125
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [gatekeeperd] Check parent profile for SID lookupsAndres Morales2015-08-054-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22257554 Change-Id: I1a363729b449a2bc8594b48dada719fd79da7036
* | | | | | | | | | am b9f438ff: Protect runtime storage mount points.Jeff Sharkey2015-08-062-12/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9f438ff841f87c8ffbca85b13a533718a18e15f': Protect runtime storage mount points.
| * | | | | | | | | Protect runtime storage mount points.Jeff Sharkey2015-08-062-12/+13
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of magic that mounts the correct view of storage access based on the runtime permissions of an app, but we forgot to protect the real underlying data sources; oops. This series of changes just bumps the directory heirarchy one level to give us /mnt/runtime which we can mask off as 0700 to prevent people from jumping to the exposed internals. Also add CTS tests to verify that we're protecting access to internal mount points like this. Bug: 22964288 Change-Id: I32068e63a3362b37e8ebca1418f900bb8537b498
* | | | | | | | | am d57125af: Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-291-25/+46
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd57125af1a81f34b162ecd5de81e6f1365aff588': Give secondary users read-only physical cards.
| * | | | | | | | Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-291-25/+46
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Give secondary users read-only physical cards.Jeff Sharkey2015-07-281-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long ago, we mounted secondary physical cards as readable by all users on the device, which enabled the use-case of loading media on a card and viewing it from all users. More recently, we started giving write access to these secondary physical cards, but this created a one-directional channel for communication across user boundaries; something that CDD disallows. This change is designed to give us the best of both worlds: the package-specific directories are writable for the user that mounted the card, but access to those "Android" directories are blocked for all other users. Other users remain able to read content elsewhere on the card. Bug: 22787184 Change-Id: I4a04a1a857a65becf5fd37d775d927af022b40ca
* | | | | | | | | | am 26f0f657: Merge "init.rc: add healthd to system group to allow write to ↵Jeffrey Vander Stoep2015-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /dev/cpuset" into mnc-dev * commit '26f0f657ec027430bde7d2237890ba59b3fd174a': init.rc: add healthd to system group to allow write to /dev/cpuset
| * | | | | | | | | Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" ↵Jeffrey Vander Stoep2015-07-281-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | * | | | | | | | | init.rc: add healthd to system group to allow write to /dev/cpusetJeff Vander Stoep2015-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add to root group to avoid introducting new bugs. Bug: 22699101 Change-Id: I9da31e0cc955efd711df3f4c6b17e39d74c01549
* | | | | | | | | | | am cc451785: Fix incorrectly sized buffer.Erik Kline2015-07-281-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc451785fe4426566f6c4a6a5156d4fb40bcc22d': Fix incorrectly sized buffer.
| * | | | | | | | | | Fix incorrectly sized buffer.Erik Kline2015-07-281-4/+4
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: use a more correct size type. Bug: 21562630 Bug: 21764392 Bug: 22464419 Change-Id: I9a9cf64f0481670828fac707e00196e222d0311e
* | | | | | | | | | am 3f62a020: logd: allow logd to write to /dev/cpuset filesJeff Vander Stoep2015-07-252-3/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f62a020c48d5d812fb2898759b93a59dc24d310': logd: allow logd to write to /dev/cpuset files
| * | | | | | | | | logd: allow logd to write to /dev/cpuset filesJeff Vander Stoep2015-07-242-3/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by logd on devices with USE_CPUSETS defined. Make /dev/cpuset/background, /dev/cpuset/foreground and /dev/cpuset/task writeable by system gid. Add logd to system group for writing to cpuset files and to root group to avoid regressions. When dropping privs, also drop supplementary groups. Bug: 22699101 Change-Id: Icc01769b18b5e1f1649623da8325a8bfabc3a3f0
* | | | | | | | | Disable scaling of the cfs tunables.Riley Andrews2015-07-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cfs tunables auto-scale with the number of active cpus by default. Given that the tunable settings are in device-independent code and it's not known how many cores are currently active when the init.rc file runs, the cfs tunables can vary pretty significantly across devices depending on the state at boot. Disable scaling of the the tunables so that we can get more consistent behavior of cfs across devices. If we want to do per-device tuning of these values, we can override what's written here in device specific files. Bug: 22634118 Change-Id: Id19b24ef819fef762521e75af55e6d4378cfc949
* | | | | | | | | am ed2fe57c: Use single tree for multiple storage views.Jeff Sharkey2015-07-161-71/+140
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed2fe57c2509d0d784ba7dbce1deef21afb2a612': Use single tree for multiple storage views.
| * | | | | | | | Use single tree for multiple storage views.Jeff Sharkey2015-07-161-71/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having each view build and maintain its own tree representing the underlying storage, switch to building a single tree that each view augments with GID/mode specific behavior. This has the nice property of a single file always having the same node ID when presented across multiple views, giving us a firm handle that we can use to invalidate kernel caches. Specifically, when a file is deleted through one view, we now tell the kernel to invalidate that file in the other two views. Bug: 22477678, 22375891 Change-Id: I3ff041d549d41040839cde9773504719a508219f
* | | | | | | | | Update partition.*.verified even with ro.boot.veritymode setSami Tolvanen2015-07-151-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to have partition.*.verified properties even when bootloader is managing dm-verity mode, because we may have failed to set up the verified partition and need a property to indicate this. This means we still need to run fs_mgr_update_verity_state and walk through all the partitions to verify the device mapper status, just without updating verity mode. Bug: 22489805 Bug: 22507568 Change-Id: Iaf28185adb8b80e5452447e54e1f4e4417a34168 (cherry picked from commit 2f42554f18e2ba3d40b736ff9ff21e79953e86a5)
* | | | | | | | | am 0fdee393: Merge "graphics: update flexible YUV format gralloc ↵Yin-Chia Yeh2015-07-141-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requirement" into mnc-dev * commit '0fdee3938ed58dac86755d04bc2a7d280ba158e7': graphics: update flexible YUV format gralloc requirement
| * | | | | | | | Merge "graphics: update flexible YUV format gralloc requirement" into mnc-devYin-Chia Yeh2015-07-141-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | graphics: update flexible YUV format gralloc requirementYin-Chia Yeh2015-07-141-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require gralloc accept flexible YUV when SW READ/WRITE usage is set. Also decouple flexible YUV from camera usage flag. Bug: 22379456 Change-Id: I5a82a8360b08036c31dc03cd639d449ba1e3ed01
* | | | | | | | | Merge "Show charging speed on Keyguard" into mnc-dr-devAdrian Roos2015-07-141-2/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show charging speed on KeyguardAdrian Roos2015-07-131-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8099739 Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
* | | | | | | | | | am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-devJim Miller2015-07-131-1/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ee9d9a8b36894b62394829c8c020e3ae5ad24c5': Fingerprint: Add HAL close() code