summaryrefslogtreecommitdiffstats
path: root/core/java/com/android/internal
Commit message (Collapse)AuthorAgeFilesLines
* support separate encryption/lockscreen passwordsDaniel Micay2016-12-161-3/+69
| | | | | | | | | | | | This adds the necessary infrastructure for allowing users to opt-in to a distinct device encryption passphrase. The passwords are still tied together by default. This makes it possible to use a complex encryption passphrase without losing the convenience of a very simple lockscreen pin. This feature can be combined with a forced reboot after a chosen number of failed unlocking attempts to prevent brute-forcing by requiring the entry of the encryption password instead.
* Make Build.TYPE and Build.FINGERPRINT consistent for apps.Danny Baumann2016-11-251-0/+2
| | | | | | | | | | Some apps (namely Android Wear) like to do comparisons between TYPE and FINGERPRINT and throw errors on inconsistencies. As our fingerprints are almost always taken from stock ROMs, they don't really match our builds, causing said comparisons to fail. Avoid those failures by taking build type out of fingerprint for apps. Change-Id: I8e8db64de7ea224572ecb3695c85abea91e0e29f
* Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-061-2/+2
|\ | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:40 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * Fix vulnerability in LockSettings serviceJim Miller2016-08-261-2/+2
| | | | | | | | | | | | | | Fixes bug 30003944 Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d (cherry picked from commit 2d71384a139ae27cbc7b57f06662bf6ee2010f2b)
* | PhoneWindowManager: set focus flags on keyguard panelsRoman Birg2016-09-081-0/+1
| | | | | | | | | | | | | | Ticket: CYNGNOS-3251 Change-Id: I394514335bdaeafdc7b89918ece1fe3d2794647f Signed-off-by: Roman Birg <roman@cyngn.com>
* | Apps on adopted storage should stay there during updateSam Mortimer2016-08-171-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An update to an app on adopted storage via a PackageInstaller.Session (eg gplay) will result in the app silently ending up back on internal storage if the (new) manifest sets INSTALL_LOCATION_INTERNAL_ONLY. However, the app data is not moved with it so the end result is that data looks like it's been wiped. Ideally, the app and data would be moved to internal. Next best would be that the user is informed that they need to uninstall and reinstall. For now, persist the app in the adopted storage location so that the user doesn't lose app data. Change-Id: I1f178ea361a875c6df6b3b20a2e44071124c39c4
* | Improve the scan processmqi2016-07-261-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use multi task to speed up the scan process CRs-Fixed: 984513 base: fix native crash in system_server Currently PackageManagerService uses multi-thread to scan packages to speed up, when scan each package, it sometimes will call SELinux's restorecon, then libselinux uses global variable fc_sehandle to selabel_lookup and write in compile_regex, so it's not thread-safe, so will cause invalid address with possibility. From backtrace, the final crash happens in pcre_exec. Add one lock in NativeLibraryHelper to make restorecon safe. Change-Id: Ida43fcda01d3450befea6afa0be5da27bb195def CRs-Fixed: 1002406, 1027381
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+13
|\ \ | |/ | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: Ia14b6d0120de0b458c7c249a11041ff121389cfa
| * Backport ChooserTarget package source check from NAdam Powell2016-05-271-1/+13
| | | | | | | | | | | | | | | | | | | | Fix a bug where a ChooserTargetService could supply a ChooserTarget pointing at a non-exported activity outside of its own package and have it launch. Bug 28384423 Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
* | Framework: allow ResolverActivity to be specialized from other packageWilhelm Fitzpatrick2016-06-092-2/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageManager already has hooks to allow the Disambiguation Dialog aka ResolverActivity to be substituted at runtime by a custom activity named via system property. Since the internal ResolverActivity already has good extension points (for use by ChooserActivity), it is useful to allow a customized ResolverActivity, provided in a separate package to be able to extend the internal activity, thus preserving core behavior as much as possible, and making forward porting easier. This patch attempts to make as few changes to the core ResolverActivity as possible to make up stream patching easy, and isolates most of the needed code into a shim (ResolverProxy) which is mostly concerned with changing the access modifier of key methods from package-private to protected. This is necessary to allow overriding of those methods from a subclass originating from a different class loader. Change-Id: I17070964fca73f0d11b4fe8d809b2a775ba9e7e6
* | SpamFilter : Hide option if notification cannot be filteredDanesh M2016-05-131-1/+18
| | | | | | | | | | | | | | | | | | Hide option to filter notification if its a completely custom notification which did not invoke setContentTitle/Message...etc. NOTES-85 Change-Id: Ieec799dba589329b994f7add703babece13b6d14
* | LockPatternUtils: Use the actual user id to set pattern sizeScott Mertz2016-04-141-10/+10
| | | | | | | | | | Ticket: CYNGNOS-2462 Change-Id: Ia68e26ec2dfc23317135d933bc25204c1380bb02
* | Implement left swipe on lockscreenDanesh M2016-04-011-0/+1
| | | | | | | | | | | | Allows user to left swipe to live lockscreen and back. Change-Id: Ia94d735695b77a091a240e13858641cf95ac0647
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-116-37/+109
|\ \ | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * | Don't assume kernel tick is 100HzThierry Strudel2016-01-222-5/+12
| | | | | | | | | | | | | | | Bug: 26729731 Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
| * | DO NOT MERGE: Fix batterystats battery level int packingAdam Lesinski2015-12-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Allow access to deprecated LOCK_PATTERN_ENABLED flag.Bryce Lee2015-12-141-0/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 4614596a39 * commit '4614596a395b6c86fff3f35a07edda2e848d743c': Allow access to deprecated LOCK_PATTERN_ENABLED flag.
| | * | Allow access to deprecated LOCK_PATTERN_ENABLED flag.Bryce Lee2015-12-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | DO NOT MERGE ANYWHERE: Fix batterystats battery level int packingAdam Lesinski2015-11-201-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Prevent DivideByZero error in BatteryStatsImplAdam Lesinski2015-12-101-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()Amit Mahajan2015-11-181-0/+27
| |/ / | | | | | | | | | | | | Bug: 23067429 Change-Id: Ia66fd1a6ff248520e86f6e502767b22c4d9d4814
| * | Merge "Don\'t query ChooserTargetService apps that haven\'t been used ↵Adam Powell2015-10-211-0/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | recently" into mnc-dr-dev am: b8cfc12c3f * commit 'b8cfc12c3f0b83e9d00b1f324be4ff5c977645ce': Don't query ChooserTargetService apps that haven't been used recently
| * | Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate ↵Adam Powell2015-10-201-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in" into mnc-dr-dev am: 4ecfbcfdea * commit '4ecfbcfdeaed67c3a08002069a530fa58582a48b': DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
| * \ \ am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '70ea857859b78a708fb99ac708ead7bdaddf79a7': Fix wrongly laid out navigation color view
| * \ \ \ am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-devAdam Powell2015-10-161-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '749334bffbc92aeaef27c274a1586fa7365cbfdc': Fix ChooserTarget app scoring
| * \ \ \ \ am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar ↵Abodunrinwa Toki2015-10-162-6/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appearance." into mnc-dr-dev * commit '9c76f61dea69e21eba3b89adbc2a00bcb522584e': DO NOT MERGE: Reduce delay of floating toolbar appearance.
| * \ \ \ \ \ am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-devAdam Powell2015-10-141-7/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c': Fix bugs introduced in ChooserActivity
| * \ \ \ \ \ \ am 11af1878: Merge "Add animation and positional stability to intent chooser ↵Adam Powell2015-10-123-57/+335
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI" into mnc-dr-dev * commit '11af18783d32f8646428500a0ff3a2a57a77bf95': Add animation and positional stability to intent chooser UI
| * \ \ \ \ \ \ \ am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-devJeff Sharkey2015-09-302-11/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30fd0628970b418dea382b388120f52504ff2243': Relax auto-launch checks for GET_CONTENT.
| * \ \ \ \ \ \ \ \ am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for ↵Adam Lesinski2015-09-291-6/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BatteryStats summary" into mnc-dr-dev * commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229': Fix asymmetry in parceling/unparceling code for BatteryStats summary
| * \ \ \ \ \ \ \ \ \ am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" ↵Bill Rassieur2015-09-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a': Fix jank: Don't write lockout deadline if not needed
| * \ \ \ \ \ \ \ \ \ \ am d5f10154: Bump BatteryStats versionAdam Lesinski2015-09-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5f10154c772b925f6527e25aeb8461de8c710cd': Bump BatteryStats version
| * \ \ \ \ \ \ \ \ \ \ \ am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-devJorim Jaggi2015-09-251-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81': Deliver camera launch source for analytics
| * \ \ \ \ \ \ \ \ \ \ \ \ am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into ↵Adam Lesinski2015-09-221-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab': Fix Array Index Out of Bounds in BatteryStatsImpl
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into ↵Andreas Gampe2015-09-222-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a': Frameworks/base: Propagate boot status to installd
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e54253bd: Merge "Fix crash when no power_profile is specified" into ↵Adam Lesinski2015-09-182-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a': Fix crash when no power_profile is specified
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into ↵Adam Lesinski2015-09-185-101/+288
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '680553957e4ff47343334881c34de6969b2ed977': BatteryStats: Better big-little CPU accounting
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for ↵Adam Powell2015-09-182-7/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disambig" into mnc-dr-dev * commit '1b67a6b84d133e1fdac352d0821034ceca739a71': Badge ChooserActivity choices with their app icon for disambig
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 39e94ebe: Handle single-choice ChooserActivities and bound ↵Adam Powell2015-09-162-28/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChooserTargetServices * commit '39e94ebe22d4959facea4c3621a0a5377242a570': Handle single-choice ChooserActivities and bound ChooserTargetServices
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-devAndres Morales2015-09-161-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38e6e4ef98ea1f116902725c282df9fb061a224e': reset lockout deadline on device reboot
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for 5d0e02b6 to cw-e-devJorim Jaggi2015-09-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id974d29581304dc644659d1c470b5413d847944b
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16093fe3: Revert "Disable fingerprint after force lock"Jorim Jaggi2015-09-101-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16093fe3f0d824731a53a264a132504deb08421a': Revert "Disable fingerprint after force lock"
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong ↵Adrian Roos2015-09-031-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential" into mnc-dr-dev * commit '34411e8fecab310a0402bd77e8fe5a5a488a783a': Don't disable fingerprint when entering wrong credential
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is ↵Clara Bayarri2015-09-021-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not working" into mnc-dev * commit '582b186cd3b41c5c67649ae2ba9176c3860ab1ec': Fix Custom action mode menu item onclick is not working
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-devAdrian Roos2015-08-311-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '781953123e5b0f0f85691eabc13b3430c3054a10': Disable fingerprint after force lock
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into ↵Adam Lesinski2015-08-312-48/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95': BatteryStats: Start using cpu power from kernel
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" ↵Ajay Panicker2015-08-271-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee': Add StateMachine.removeDeferredMessages()
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a07177f0: Merge "Launching the camera now from systemUI including ↵Selim Cinek2015-08-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animations" into mnc-dr-dev * commit 'a07177f0ad362ab3e03029cf774e55579ea025cf': Launching the camera now from systemUI including animations
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-devAdrian Roos2015-08-261-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd56892da195b183bb5205a0c526bd730fb8a672f': Disable fingerprint after user lockout
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b5e47228: Add StrongAuthTrackerAdrian Roos2015-08-222-7/+181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5e4722891e7bbf2fffcd995af02838667a3abab': Add StrongAuthTracker