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

200105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Jorim Jaggi
e1de9f6745 Fix black Keyguard 
When a window has both the flag fullscreen and the dismiss Keyguard
flag, we end up in a state where we hide the status bar window but
all other windows, because mShowingLockscreen nevers gets set
correctly. Move it up so we always set it no matter whether the
status bar window was visible.

Bug: 22875357
Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
 2015-09-24 17:47:14 +00:00
Vinit Deshpande
629909e02b Merge "Disable wifi firmware logging by default" into mnc-dr-dev 2015-09-24 03:58:38 +00:00
Jorim Jaggi
05b11bf357 Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 2015-09-24 00:23:47 +00:00
Vinit Deshpande
4b3634513b Disable wifi firmware logging by default 
This is really needed for debugging phase, which is over
now; and disabling it will reduce surface area

Bug: 24317401

Change-Id: I0acf9efc94333cb274d4286df9c853431d86883d
 2015-09-23 16:57:18 -07:00
Jorim Jaggi
ad371b2e22 Update message in SIM PIN view when configuration changes 
Bug: 24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
 2015-09-23 11:52:12 -07:00
Jorim Jaggi
6a15d528c0 Do not go over handler to dispatch keyguard visibility 
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.

Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
 2015-09-23 18:44:20 +00:00
Todd Kennedy
739bb7c694 Merge "save "retain loader" state" into mnc-dr-dev 2015-09-23 17:56:52 +00:00
Paul Jensen
4b7b811784 am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '9971167fbe7f3b356ba7fd89d91271376a56d235':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 14:50:45 +00:00
Paul Jensen
83ce299c6a am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '62bb18976f3a79405897bf44bdec8f0abd855b9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 14:50:40 +00:00
Paul Jensen
9971167fbe am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 14:42:02 +00:00
Paul Jensen
62bb18976f am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '554cecea4c5e39c25efb721258366ce12e6b861c':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 14:41:57 +00:00
Baligh Uddin
9c5e49b713 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:57 +00:00
Baligh Uddin
18daf48f1a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:31 +00:00
Baligh Uddin
d213d28807 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:15:25 +00:00
Baligh Uddin
a6928d4d26 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:12:25 +00:00
Baligh Uddin
64f17a522a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-23 14:12:06 +00:00
Paul Jensen
5ebe8e26f2 am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:33:18 +00:00
Paul Jensen
554cecea4c am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:33:13 +00:00
Paul Jensen
4cbfe3316f am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4 am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105 Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev 2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314 Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 2015-09-23 10:58:57 +00:00
Baligh Uddin
4b23a8149b Import translations. DO NOT MERGE 
Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import
 2015-09-23 01:54:57 -07:00
Baligh Uddin
3730fa2756 Import translations. DO NOT MERGE 
Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import
 2015-09-23 01:44:04 -07:00
Baligh Uddin
c5c9bdb08d Import translations. DO NOT MERGE 
Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import
 2015-09-23 01:31:31 -07:00
Baligh Uddin
5115b26935 Import translations. DO NOT MERGE 
Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import
 2015-09-23 01:23:51 -07:00
Justin Harrison
47cae24077 Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 2015-09-23 06:00:24 +00:00
Michael Lentine
17a764431a Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 2015-09-23 05:19:19 +00:00
Baligh Uddin
effcd9f4ac Import translations. DO NOT MERGE 
Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import
 2015-09-22 21:42:46 -07:00
Soonil Nagarkar
79490dbacd Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 2015-09-23 01:34:53 +00:00
Jorim Jaggi
302475e93c Fix verifyUnlock 
Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
 2015-09-23 00:57:50 +00:00
Jorim Jaggi
1b68e8b711 Log time difference between power button presses for gesture 
Bug: 24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf
 2015-09-22 17:05:12 -07:00
Baligh Uddin
d2b597d1fd Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev 2015-09-22 20:50:02 +00:00
Michael Lentine
193560002f Dismiss color fade when it is no longer used. 
Previously the color fade layers would stay active until the screen was turned
back on. After this change, the layers are dismissed as soon as color fade
completes.

Bug: 24276564

Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059
 2015-09-22 13:07:05 -07:00
Adam Lesinski
1b57758a1b Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 2015-09-22 18:33:14 +00:00
Andreas Gampe
b49245f962 Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev 2015-09-22 18:27:39 +00:00
Todd Kennedy
e16fb554dd save "retain loader" state 
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
 2015-09-22 10:16:42 -07:00
Selim Cinek
bb998c927c Extended the maximum pulsing duration when dozing 
Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6
 2015-09-22 10:05:29 +02:00
Adam Lesinski
52290c9c4f Fix Array Index Out of Bounds in BatteryStatsImpl 
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
 2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78 Frameworks/base: Propagate boot status to installd 
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
 2015-09-21 15:16:13 -07:00
Zach Jang
88f92ec5a7 am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:37:34 +00:00
Zach Jang
c53f18b7b3 am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '937141cb75160a1a51b9568481225aec286c5a86':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:37:30 +00:00
Zach Jang
fed2854653 am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:30:32 +00:00
Zach Jang
937141cb75 am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0cae8381666248e44875756e72998e55ed3f9151':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:30:27 +00:00
Zach Jang
3e344f3fcb am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:07:04 +00:00