OSDN Git Service
Lorenzo Colitti [Sun, 11 Oct 2015 06:48:33 +0000 (06:48 +0000)]
Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* changes:
Support DHCP replies with multiple default gateways.
Accept DHCP responses from non-67 server source ports
Improve logging of DHCP parse errors using exceptions.
Dianne Hackborn [Sat, 10 Oct 2015 00:42:02 +0000 (00:42 +0000)]
Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev
Dianne Hackborn [Fri, 9 Oct 2015 23:09:25 +0000 (16:09 -0700)]
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
...user for service info
Now it does.
The actual change is basically one line, passing in the current user
when building the service info. The rest is more debugging output to
be able to see what is going on.
Change-Id: I451884e0780aac6ee92fd2cd520071894afdf586
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Bug:
24342101
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit
83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit
2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
Jason Monk [Thu, 8 Oct 2015 20:21:00 +0000 (20:21 +0000)]
Merge "Actually apply after no sims change." into mnc-dr-dev
Jeff Sharkey [Thu, 8 Oct 2015 16:58:54 +0000 (16:58 +0000)]
Merge "Hold wake-lock during copy operations." into mnc-dr-dev
Jason Monk [Thu, 8 Oct 2015 14:09:21 +0000 (10:09 -0400)]
Actually apply after no sims change.
Bug:
24244260
Change-Id: I922d45e6dcc4eb85fc7d93824e7d01645a90266e
Puneet Kumar [Thu, 8 Oct 2015 08:17:38 +0000 (08:17 +0000)]
Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:17:23 +0000 (08:17 +0000)]
Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
Lorenzo Colitti [Wed, 16 Sep 2015 22:55:29 +0000 (07:55 +0900)]
Support DHCP replies with multiple default gateways.
Just use the first one for compatibility with the legacy client.
Bug:
23975855
Change-Id: Id6a0b0de32e8947c12c02eb9a3be417e2f82c99a
Erik Kline [Tue, 6 Oct 2015 09:43:17 +0000 (18:43 +0900)]
Accept DHCP responses from non-67 server source ports
Bug:
24687559
Change-Id: I5f03b8b2780c558281d8a50d0893fd64f2812add
Erik Kline [Wed, 16 Sep 2015 06:44:54 +0000 (15:44 +0900)]
Improve logging of DHCP parse errors using exceptions.
Bug:
23975855
Change-Id: I62464b92f0bb568e57bf5e1a63bc75f22c75aac1
Tim Murray [Wed, 7 Oct 2015 23:21:14 +0000 (23:21 +0000)]
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 23:03:52 +0000 (23:03 +0000)]
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 22:17:19 +0000 (15:17 -0700)]
MediaActionSound: Fix video stop sound
Bug:
24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
Yin-Chia Yeh [Wed, 7 Oct 2015 21:36:35 +0000 (21:36 +0000)]
am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a636be6c9a8a9192f72a111c2b3084a226d37b7e':
Camera: fix wrong FULL feature string
Robert Carr [Wed, 7 Oct 2015 18:24:31 +0000 (11:24 -0700)]
Ensure SurfaceView requests WM relayout when size changes.
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).
Bug:
23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit
a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
Eric Laurent [Wed, 7 Oct 2015 13:39:51 +0000 (13:39 +0000)]
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
Yin-Chia Yeh [Tue, 6 Oct 2015 20:45:20 +0000 (13:45 -0700)]
Camera: fix wrong FULL feature string
Bug:
24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
Selim Cinek [Tue, 6 Oct 2015 01:59:50 +0000 (01:59 +0000)]
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
Adam Lesinski [Tue, 6 Oct 2015 00:51:13 +0000 (00:51 +0000)]
am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
46684d2caeef93f43be260d996e925ea6e4147ea':
Add anydpi to the providing-resources docs
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev
Jean-Michel Trivi [Mon, 5 Oct 2015 22:26:21 +0000 (15:26 -0700)]
Fix AudioService rotation helper thread
Fix a race condition where the wait index can be incremented inbetween
the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
the last sleep is useless.
Bug
24677424
Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
Eric Laurent [Thu, 1 Oct 2015 00:44:28 +0000 (17:44 -0700)]
ZenModeHelper: fix cross deadlock with AudioService
Processing ZenModeHelper.setConfig() synchronously in
ZenModeConditions.onConditionChanged() can cause a cross deadlock between
ConditionProviders.mMutex and AudioService.mSettingsLock.
Add a method to set Zen mode config asynchronously.
Bug:
24528290.
Change-Id: I9c1701ca6bef084527821175d84002b612241995
Geoff Mendal [Mon, 5 Oct 2015 13:58:33 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
Tim Murray [Fri, 2 Oct 2015 20:43:30 +0000 (20:43 +0000)]
Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
Jorim Jaggi [Fri, 2 Oct 2015 19:55:26 +0000 (19:55 +0000)]
Merge "Add minimum time for double tap gesture" into mnc-dr-dev
Jeff Sharkey [Thu, 1 Oct 2015 22:14:57 +0000 (15:14 -0700)]
Hold wake-lock during copy operations.
If the CPU goes to sleep during the copy, certain devices will
collapse the USB OTG power domain, which can cause user data loss.
Bug:
24574575
Change-Id: I8e26caac8784490d2dee324b38e6085cd55eb8bb
Jean-Michel Trivi [Thu, 1 Oct 2015 22:00:59 +0000 (15:00 -0700)]
AudioService: alternative way of handling device rotation
For devices that monitor orientation (primarily for channel assignment
to stereo speakers):
The com.android.server.policy.WindowOrientationListener API is more
power efficient than simply monitoring the device's orientation. When
supported, use it instead of android.view.OrientationEventListener.
When WindowOrientationListener reports an orientation change, start
a thread to poll the UI orientation, as its change may lag behind
the observed rotation. Gradually increasing delays between polls
are stored in a table.
Bug
24415763
Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
Tim Murray [Fri, 2 Oct 2015 00:07:12 +0000 (17:07 -0700)]
Send POWER_HINT_INTERACTION on rotate.
Send a POWER_HINT_INTERACTION to improve redraw performance when the
phone is rotated.
bug
24583227
Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
Jorim Jaggi [Thu, 1 Oct 2015 21:13:04 +0000 (14:13 -0700)]
Add minimum time for double tap gesture
Bug:
24304031
Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
Jianing Wei [Thu, 1 Oct 2015 16:40:21 +0000 (16:40 +0000)]
am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
2813b0fae99fed1096dc23c3899e223459a54cec':
Camera2: Update video stabilization API doc.
Jeff Sharkey [Wed, 30 Sep 2015 16:22:17 +0000 (16:22 +0000)]
Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
Jeff Sharkey [Wed, 30 Sep 2015 16:20:40 +0000 (16:20 +0000)]
Merge "Clean stale entries when deleting files." into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:01:01 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
Adam Lesinski [Tue, 29 Sep 2015 23:22:59 +0000 (23:22 +0000)]
Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
Jianing Wei [Tue, 29 Sep 2015 21:24:36 +0000 (14:24 -0700)]
Camera2: Update video stabilization API doc.
Bug:
23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
Dmitry Torokhov [Wed, 23 Sep 2015 01:07:20 +0000 (18:07 -0700)]
Add ESC mapping for Pixel C keyboard
Now that we have "replace" key event support in the framework we can map
ESC as AltR+1.
Bug:
24504154
Change-Id: Ief8a50098fc5484171011f268ffc22a309cbba62
Dmitry Torokhov [Tue, 22 Sep 2015 22:51:22 +0000 (15:51 -0700)]
Add layout and keymap for Pixel C Bluetooth keyboard
This adds special layout and character map for Pixel C keyboard (Dragon
base) that lacks several keys, such as ESC, bracket keys, tilda and
backslash, which are mapped various Alt-R combinations.
Currently we map:
[Shift]+AltR+2 -> ~ and `
[Shift]+AltR+O -> { and [
[Shift]+AltR+P -> } and ]
[Shift]+AltR+= -> | and \
ESC mapping requires additional changes.
Bug:
24504154
Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
Jeff Sharkey [Tue, 29 Sep 2015 20:04:46 +0000 (13:04 -0700)]
Relax auto-launch checks for GET_CONTENT.
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults. A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.
However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app. Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.
Bug:
24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
Selim Cinek [Thu, 24 Sep 2015 11:19:25 +0000 (13:19 +0200)]
Ambient display now comes up immediately when a notification comes in
Previously there was always a 1s delay which could even become a 5-8s
delay if the Alarm was not delivered in time.
Bug:
24355754
Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
Bill Rassieur [Mon, 28 Sep 2015 23:02:46 +0000 (23:02 +0000)]
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
Jorim Jaggi [Mon, 28 Sep 2015 20:57:37 +0000 (13:57 -0700)]
Fix jank: Don't write lockout deadline if not needed
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug:
24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
Adam Lesinski [Mon, 28 Sep 2015 17:21:33 +0000 (10:21 -0700)]
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Bug:
24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
Billy Lau [Mon, 28 Sep 2015 17:24:25 +0000 (17:24 +0000)]
am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
f360bbca969f60ee968240d22bc0b1f1e5e17218':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:18:30 +0000 (17:18 +0000)]
Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
Adam Lesinski [Sun, 27 Sep 2015 21:24:49 +0000 (21:24 +0000)]
Bump BatteryStats version
Bug:
24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
Baligh Uddin [Sun, 27 Sep 2015 04:05:09 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 26 Sep 2015 20:05:11 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
Baligh Uddin [Sat, 26 Sep 2015 19:34:51 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
Adrian Roos [Fri, 25 Sep 2015 23:23:26 +0000 (23:23 +0000)]
Merge "Show charging speed when time to full is available" into mnc-dr-dev
Adrian Roos [Thu, 24 Sep 2015 00:03:47 +0000 (17:03 -0700)]
Show charging speed when time to full is available
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.
Bug:
24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
Jeff Sharkey [Fri, 25 Sep 2015 01:15:13 +0000 (18:15 -0700)]
Clean stale entries when deleting files.
When deleting files directly from external storage devices, remove
any matching entries from MediaStore so we don't end up showing
stale entries to clients, such as MTP/PTP.
Also handles the case where an entire directory is deleted.
Bug:
24045921
Change-Id: I802470fa1aa03e0bec147ea113f1a49e26a0f3f9
Ian Pedowitz [Fri, 25 Sep 2015 17:04:14 +0000 (17:04 +0000)]
Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
Jorim Jaggi [Fri, 25 Sep 2015 06:54:42 +0000 (06:54 +0000)]
Merge "Do not issue config change command when not needed" into mnc-dr-dev
Pankaj Kanwar [Fri, 25 Sep 2015 04:40:23 +0000 (04:40 +0000)]
Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
Lorenzo Colitti [Fri, 25 Sep 2015 03:54:06 +0000 (12:54 +0900)]
Give the DhcpClient alarm broadcasts foreground priority.
Bug:
24265658
Bug:
24224067
Change-Id: I375097e7957643efb4bc0bb81318b13d9b9c82c1
Baligh Uddin [Fri, 25 Sep 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:57:21 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:40 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:35 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:36:51 +0000 (19:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
Eric Laurent [Fri, 25 Sep 2015 01:41:48 +0000 (18:41 -0700)]
AudioService: cleanup sco audio mode upon disconnection.
Clean up SCO forced usage and A2DP suspend state upon
SCO device or profile disconnection.
This is in case the Bluetooth Headset service does not
do it.
Bug:
24316765.
Change-Id: Ifc0305607c186be49b2eb42b7868647292e56137
Baligh Uddin [Fri, 25 Sep 2015 01:40:38 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50eeba5466bb054212dc51f8a8d1b5b76f56a31d
Auto-generated-cl: translation import
Jorim Jaggi [Fri, 25 Sep 2015 00:35:58 +0000 (17:35 -0700)]
Do not issue config change command when not needed
This caused a but where WindowManager was blocked on this to perform a
layout, leading to delays in screen wake-ups.
Bug:
24383169
Change-Id: I42bc08dae9057060f09c301328bb4839a970c597
Jorim Jaggi [Fri, 25 Sep 2015 01:27:05 +0000 (01:27 +0000)]
Merge "Deliver camera launch source for analytics" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 01:12:20 +0000 (18:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 01:10:14 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
Michael Lentine [Fri, 25 Sep 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
Michael Lentine [Thu, 24 Sep 2015 23:58:46 +0000 (16:58 -0700)]
Revert "Dismiss color fade when it is no longer used."
Bug:
24371570
This reverts commit
193560002fbc080f0006df088f8f5e9c165bfd78.
Adrian Roos [Thu, 24 Sep 2015 23:40:43 +0000 (23:40 +0000)]
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
Jorim Jaggi [Wed, 23 Sep 2015 19:59:22 +0000 (12:59 -0700)]
Deliver camera launch source for analytics
Bug:
24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
Adrian Roos [Thu, 24 Sep 2015 23:32:01 +0000 (23:32 +0000)]
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
Adrian Roos [Thu, 24 Sep 2015 23:25:48 +0000 (23:25 +0000)]
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
Adrian Roos [Thu, 24 Sep 2015 23:11:55 +0000 (23:11 +0000)]
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
Adrian Roos [Thu, 24 Sep 2015 22:59:37 +0000 (22:59 +0000)]
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
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
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
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
Jorim Jaggi [Wed, 23 Sep 2015 21:59:50 +0000 (14:59 -0700)]
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
Vinit Deshpande [Thu, 24 Sep 2015 03:58:38 +0000 (03:58 +0000)]
Merge "Disable wifi firmware logging by default" into mnc-dr-dev
Jorim Jaggi [Thu, 24 Sep 2015 00:23:47 +0000 (00:23 +0000)]
Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
Vinit Deshpande [Wed, 23 Sep 2015 23:51:52 +0000 (16:51 -0700)]
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
Jorim Jaggi [Wed, 23 Sep 2015 18:52:12 +0000 (11:52 -0700)]
Update message in SIM PIN view when configuration changes
Bug:
24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
Jorim Jaggi [Tue, 22 Sep 2015 22:55:33 +0000 (15:55 -0700)]
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
Todd Kennedy [Wed, 23 Sep 2015 17:56:52 +0000 (17:56 +0000)]
Merge "save "retain loader" state" into mnc-dr-dev
Paul Jensen [Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)]
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
Paul Jensen [Wed, 23 Sep 2015 14:50:40 +0000 (14:50 +0000)]
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.
Paul Jensen [Wed, 23 Sep 2015 14:42:02 +0000 (14:42 +0000)]
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
Paul Jensen [Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)]
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.
Baligh Uddin [Wed, 23 Sep 2015 14:15:57 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:31 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:25 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:25 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:06 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Jensen [Wed, 23 Sep 2015 11:33:18 +0000 (11:33 +0000)]
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
Paul Jensen [Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)]
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.
Paul Jensen [Wed, 23 Sep 2015 11:21:27 +0000 (11:21 +0000)]
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
Paul Jensen [Wed, 23 Sep 2015 11:21:22 +0000 (11:21 +0000)]
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.