Adrian Roos
2ce4fb0c1f
am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'a4150f49d031d431a7bdcc1cdedbffc4d3e312a5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:59:45 +00:00
Adrian Roos
a4150f49d0
am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:50:09 +00:00
Adrian Roos
f02ba4b8ff
am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '09945c0bdef5acf8276d433a96de3a5589b2de86':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:40:43 +00:00
Jorim Jaggi
40aa8811bc
Deliver camera launch source for analytics
...
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Adrian Roos
09945c0bde
am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:32:01 +00:00
Adrian Roos
fe7ceca1ac
am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:25:48 +00:00
Adrian Roos
9ceec2f0f0
am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:11:55 +00:00
Adrian Roos
f6c7515817
am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 22:59:37 +00:00
Adrian Roos
12c54dfa12
am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 22:49:19 +00:00
Adrian Roos
c9f7abe370
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
2015-09-24 22:39:23 +00:00
Todd Kennedy
8f08db9def
am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master
...
* commit '4e321745173de1eb89343238fadfbcc7ba1a88f9':
Frameworks/base: Propagate boot status to installd
2015-09-24 21:48:50 +00:00
Todd Kennedy
4e32174517
resolved conflicts for cafacef6 to stage-aosp-master
...
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
2015-09-24 14:34:06 -07:00
Todd Kennedy
cafacef60e
Merge "Frameworks/base: Propagate boot status to installd"
2015-09-24 20:35:09 +00:00
Andreas Gampe
55fe944f98
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
(cherry picked from commit 06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-24 12:27:25 -07:00
Sean Young
da2f549f3b
am 2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
...
* commit '2d39bfd51fabee0396fa3107ff98065ef4832667':
Properly expose methods that override a non-hidden method in a hidden superclass in the API files.
2015-09-24 19:01:33 +00:00
Sean Young
2d39bfd51f
Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
2015-09-24 18:55:50 +00:00
Jorim Jaggi
35f215cfaf
am 2d48a93f: am 98a8c7c5: am e1de9f67: Fix black Keyguard
...
* commit '2d48a93fea89cbdaae8e6cb718dbc382e35764df':
Fix black Keyguard
2015-09-24 18:20:57 +00:00
Jorim Jaggi
2d48a93fea
am 98a8c7c5: am e1de9f67: Fix black Keyguard
...
* commit '98a8c7c553108e6d6f6260ae5c1f05d8a6c8af10':
Fix black Keyguard
2015-09-24 18:14:42 +00:00
Jorim Jaggi
98a8c7c553
am e1de9f67: Fix black Keyguard
...
* commit 'e1de9f674575df3b17e475c4f32dd93d33e596e3':
Fix black Keyguard
2015-09-24 18:08:07 +00:00
Jeff Hao
f005d55fb7
am 75ab8c77: am 384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
...
* commit '75ab8c7789b4ec5e26bc7d2f773a6c39d39a821b':
Shorten first boot time by filtering dexopted apps by LRU.
2015-09-24 17:47:56 +00: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
Jeff Hao
75ab8c7789
am 384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
...
* commit '384d84f4f02643b63335f6d8d884adc1186d6896':
Shorten first boot time by filtering dexopted apps by LRU.
2015-09-24 17:39:34 +00:00
Jeff Hao
384d84f4f0
Merge "Shorten first boot time by filtering dexopted apps by LRU."
2015-09-24 17:30:25 +00:00
Jeff Hao
b84cb9e971
Shorten first boot time by filtering dexopted apps by LRU.
...
No longer dexopt all system apps and boot listener user apps.
Bug: 23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589
Change-Id: Ib4f960686afcfda13838f7783c2d3ccf8e26db72
2015-09-24 10:24:10 -07:00
Elliott Hughes
ea1831d211
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
...
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1
resolved conflicts for a884d81e to stage-aosp-master
...
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Elliott Hughes
a884d81e86
Merge "constify JNINativeMethod function pointer tables"
2015-09-24 16:01:15 +00:00
Bryce Lee
30b0aa04dc
Add additional broadcast for when a phone account is unregistered.
...
Change-Id: Ia14a4206ea50af11c6151e11a95851e5ffa2cd99
2015-09-23 21:53:53 -07:00
Vinit Deshpande
64f6236cdd
am 2bc3ff3c: am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
...
* commit '2bc3ff3cf6b692a4bd69d75cb3e11fc0b0b063fe':
Disable wifi firmware logging by default
2015-09-24 04:26:03 +00:00
Vinit Deshpande
2bc3ff3cf6
am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
...
* commit 'de02fe2afdc835eca72bb05a1514daa439bb2b40':
Disable wifi firmware logging by default
2015-09-24 04:17:40 +00:00
Vinit Deshpande
de02fe2afd
am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
...
* commit '629909e02b97796ff0b79dbd03c2e72dd3d1e6bb':
Disable wifi firmware logging by default
2015-09-24 04:05:26 +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
8ba8c543f7
am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit 'b278ea0cab555f16d0d8278ee3eadf75c6266920':
Update message in SIM PIN view when configuration changes
2015-09-24 02:41:36 +00:00
Jorim Jaggi
b278ea0cab
am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a':
Update message in SIM PIN view when configuration changes
2015-09-24 02:29:01 +00:00
Jorim Jaggi
27f26df629
am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
Update message in SIM PIN view when configuration changes
2015-09-24 02:20:37 +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
Ned Burns
f4e1d10cd3
Kill ActivityView's background thread when it's destroyed
...
We were leaking background threads for every new ActivityView.
Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
2015-09-23 20:19:16 -04: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
Deepanshu Gupta
e5346dca47
am 51a05d74: Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
...
* commit '51a05d74a81aeb334ef095fc6f1aa98e5163763f':
Fix TypedArray.getTextArray()
2015-09-23 23:17:22 +00:00
Deepanshu Gupta
51a05d74a8
Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
2015-09-23 23:05:06 +00:00
Deepanshu Gupta
6649ca3711
Fix TypedArray.getTextArray()
...
Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
2015-09-23 16:03:02 -07:00
Jorim Jaggi
93d1a17baf
am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '1af3c6f401da0ab8c4ddefd3e1776f9be50a1389':
Do not go over handler to dispatch keyguard visibility
2015-09-23 19:12:41 +00:00
Jorim Jaggi
1af3c6f401
am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '1bcb3472669529edc991a31e6cbf7866a385383e':
Do not go over handler to dispatch keyguard visibility
2015-09-23 19:03:26 +00:00
Jorim Jaggi
1bcb347266
am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
Do not go over handler to dispatch keyguard visibility
2015-09-23 18:55:38 +00: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
1c9a9a20c3
am 8faa9e9e: am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
...
* commit '8faa9e9e349011aebab6527476e315f6a5f610e4':
save "retain loader" state
2015-09-23 18:30:57 +00:00
Todd Kennedy
8faa9e9e34
am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
...
* commit '898e6973ca198f327059d331b4d83b1d183d5fb1':
save "retain loader" state
2015-09-23 18:12:03 +00:00
Todd Kennedy
898e6973ca
am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
...
* commit '739bb7c694aee521995100c456cf1c8341820bec':
save "retain loader" state
2015-09-23 18:05:58 +00:00
Todd Kennedy
739bb7c694
Merge "save "retain loader" state" into mnc-dr-dev
2015-09-23 17:56:52 +00:00