OSDN Git Service

android-x86/frameworks-base.git
8 years agoam f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
Ned Burns [Fri, 25 Sep 2015 21:10:09 +0000 (21:10 +0000)]
am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed

* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed

8 years agoMerge "Adds an option to override RemoteViews transition." into cw-e-dev
Gus Prevas [Fri, 25 Sep 2015 17:17:44 +0000 (17:17 +0000)]
Merge "Adds an option to override RemoteViews transition." into cw-e-dev

8 years agoAdds an option to override RemoteViews transition.
Gus Prevas [Thu, 17 Sep 2015 21:34:46 +0000 (17:34 -0400)]
Adds an option to override RemoteViews transition.

This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches.  If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.

Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931

8 years agoam 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into...
Ian Pedowitz [Fri, 25 Sep 2015 17:10:33 +0000 (17:10 +0000)]
am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev

* commit '31fe464d50bcd4360ac004d44d6938eac762d78d':
  Give the DhcpClient alarm broadcasts foreground priority.

8 years agoMerge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
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

8 years agoMerge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into...
Joe LaPenna [Fri, 25 Sep 2015 08:53:34 +0000 (08:53 +0000)]
Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev

8 years agoDisable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
Joe LaPenna [Fri, 25 Sep 2015 08:29:55 +0000 (01:29 -0700)]
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE

BUG: 23753686

Change-Id: Ia75046df38ebb8630e1b5ea1709bfe63eb8f177e

8 years agoam ea9675e7: Merge "Do not issue config change command when not needed" into mnc...
Jorim Jaggi [Fri, 25 Sep 2015 07:02:08 +0000 (07:02 +0000)]
am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev

* commit 'ea9675e7aa11219d426a3c0ab3929ea16a34a4c7':
  Do not issue config change command when not needed

8 years agoMerge "Do not issue config change command when not needed" 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

8 years agoam 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into...
Pankaj Kanwar [Fri, 25 Sep 2015 04:45:52 +0000 (04:45 +0000)]
am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev

* commit '65bfe1cac3297d3d4463db753c0397f28c872637':
  AudioService: cleanup sco audio mode upon disconnection.

8 years agoMerge "AudioService: cleanup sco audio mode upon disconnection." 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

8 years agoGive the DhcpClient alarm broadcasts foreground priority.
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

8 years agoam 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 03:05:16 +0000 (03:05 +0000)]
am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '2f09d2a999edfba173771ab020b87eca7ec7ef26':
  Import translations. DO NOT MERGE

8 years agoam 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 03:05:12 +0000 (03:05 +0000)]
am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '4ee34138c03dee1fd248046b135d9b4bcd84efdd':
  Import translations. DO NOT MERGE

8 years agoam 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 03:05:08 +0000 (03:05 +0000)]
am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9db221c88c678419b1c6ac7cd8223b37cd2a43a4':
  Import translations. DO NOT MERGE

8 years agoam 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 03:05:04 +0000 (03:05 +0000)]
am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9b1c6f7781fba239c1636a418a9678c8b3e53896':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoImport translations. DO NOT MERGE
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

8 years agoAudioService: cleanup sco audio mode upon disconnection.
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoDo not issue config change command when not needed
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

8 years agoam ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
Jorim Jaggi [Fri, 25 Sep 2015 01:30:43 +0000 (01:30 +0000)]
am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev

* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics

8 years agoMerge "Deliver camera launch source for analytics" into mnc-dr-dev
Jorim Jaggi [Fri, 25 Sep 2015 01:27:05 +0000 (01:27 +0000)]
Merge "Deliver camera launch source for analytics" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoam cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into...
Michael Lentine [Fri, 25 Sep 2015 00:40:39 +0000 (00:40 +0000)]
am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev

* commit 'cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
  Revert "Dismiss color fade when it is no longer used."

8 years agoMerge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
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

8 years agoRevert "Dismiss color fade when it is no longer used."
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.

8 years agoam f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54df...
Adrian Roos [Thu, 24 Sep 2015 23:50:09 +0000 (23:50 +0000)]
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

8 years agoam 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe...
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

8 years agoDeliver camera launch source for analytics
Jorim Jaggi [Wed, 23 Sep 2015 19:59:22 +0000 (12:59 -0700)]
Deliver camera launch source for analytics

Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da

8 years agoam fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge...
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

8 years agoam 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next...
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

8 years agoam f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show...
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

8 years agoam 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via...
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

8 years agoam c9f7abe3: Merge "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

8 years agoMerge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
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

8 years agoam e1de9f67: Fix black Keyguard
Jorim Jaggi [Thu, 24 Sep 2015 18:08:07 +0000 (18:08 +0000)]
am e1de9f67: Fix black Keyguard

* commit 'e1de9f674575df3b17e475c4f32dd93d33e596e3':
  Fix black Keyguard

8 years agoFix black Keyguard
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

8 years agoam 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
Vinit Deshpande [Thu, 24 Sep 2015 04:05:26 +0000 (04:05 +0000)]
am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev

* commit '629909e02b97796ff0b79dbd03c2e72dd3d1e6bb':
  Disable wifi firmware logging by default

8 years agoMerge "Disable wifi firmware logging by default" into mnc-dr-dev
Vinit Deshpande [Thu, 24 Sep 2015 03:58:38 +0000 (03:58 +0000)]
Merge "Disable wifi firmware logging by default" into mnc-dr-dev

8 years agoam 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into...
Jorim Jaggi [Thu, 24 Sep 2015 02:20:37 +0000 (02:20 +0000)]
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

8 years agoMerge "Update message in SIM PIN view when configuration changes" 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

8 years agoKill ActivityView's background thread when it's destroyed
Ned Burns [Thu, 24 Sep 2015 00:15:28 +0000 (20:15 -0400)]
Kill ActivityView's background thread when it's destroyed

We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38

8 years agoDisable wifi firmware logging by default
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

8 years agoam 6a15d528: Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 18:55:38 +0000 (18:55 +0000)]
am 6a15d528: Do not go over handler to dispatch keyguard visibility

* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
  Do not go over handler to dispatch keyguard visibility

8 years agoUpdate message in SIM PIN view when configuration changes
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

8 years agoDo not go over handler to dispatch keyguard visibility
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

8 years agoam 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
Todd Kennedy [Wed, 23 Sep 2015 18:05:58 +0000 (18:05 +0000)]
am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state

8 years agoMerge "save "retain loader" state" into mnc-dr-dev
Todd Kennedy [Wed, 23 Sep 2015 17:56:52 +0000 (17:56 +0000)]
Merge "save "retain loader" state" into mnc-dr-dev

8 years agoam 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am...
Paul Jensen [Wed, 23 Sep 2015 17:25:49 +0000 (17:25 +0000)]
am 4b7b8117: 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 '4b7b81178482029f7f58d64cea8620574294ce78':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f871...
Paul Jensen [Wed, 23 Sep 2015 17:25:45 +0000 (17:25 +0000)]
am 83ce299c: 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 '83ce299c6a676819351985c379661ae1f98e806c':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:26 +0000 (17:25 +0000)]
am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
  Import translations. DO NOT MERGE

8 years agoam 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:22 +0000 (17:25 +0000)]
am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '18daf48f1af38a75c2fb2a67204fc0852121ade2':
  Import translations. DO NOT MERGE

8 years agoam d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:18 +0000 (17:25 +0000)]
am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'd213d28807c07e7030ae506413fbb0d2c6a9c6b9':
  Import translations. DO NOT MERGE

8 years agoam a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:08 +0000 (17:25 +0000)]
am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a6928d4d2673f38e4c4110f1d27537044540a7aa':
  Import translations. DO NOT MERGE

8 years agoam 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:04 +0000 (17:25 +0000)]
am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '64f17a522ab39bec570e96c6bab7442f6026b902':
  Import translations. DO NOT MERGE

8 years agoam 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge...
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

8 years agoam 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e9834...
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.

8 years agoam 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark...
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

8 years agoam 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge...
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.

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:57 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoam 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequest...
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

8 years agoam 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network...
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.

8 years agoam 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted...
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

8 years agoam 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability...
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.

8 years agoam 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they...
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
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

8 years agoam 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce...
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
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.

8 years agoam ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have...
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
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

8 years agoam a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoMerge "Don't mark NetworkRequests restricted when they don't have restricted caps...
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev

8 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:54:57 +0000 (01:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:44:04 +0000 (01:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:31:31 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:23:51 +0000 (01:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import

8 years agoam 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:07:47 +0000 (06:07 +0000)]
am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '47cae24077015c5226f5b2d00ebe841ccbaed2d6':
  Extended the maximum pulsing duration when dozing

8 years agoMerge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:00:24 +0000 (06:00 +0000)]
Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

8 years agoam 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:25:58 +0000 (05:25 +0000)]
am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '17a764431a71ff91cbd9272d592fdcd15a9c7539':
  Dismiss color fade when it is no longer used.

8 years agoMerge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 04:42:46 +0000 (21:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import

8 years agoam 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 01:58:11 +0000 (01:58 +0000)]
am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit '79490dbacd90a851ed8d03d64acedbf3616adba4':
  Fix reintroduction of b/10845061

8 years agoam 302475e9: Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 01:58:01 +0000 (01:58 +0000)]
am 302475e9: Fix verifyUnlock

* commit '302475e93ce00287770aba9668acbe86e8b20a05':
  Fix verifyUnlock

8 years agoam 1b68e8b7: Log time difference between power button presses for gesture
Jorim Jaggi [Wed, 23 Sep 2015 01:57:55 +0000 (01:57 +0000)]
am 1b68e8b7: Log time difference between power button presses for gesture

* commit '1b68e8b711281a65c73006f10fdc2fdf2379ad60':
  Log time difference between power button presses for gesture

8 years agoMerge "Fix reintroduction of b/10845061" into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 01:34:53 +0000 (01:34 +0000)]
Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

8 years agoFix verifyUnlock
Jorim Jaggi [Tue, 22 Sep 2015 19:44:47 +0000 (12:44 -0700)]
Fix verifyUnlock

Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a

8 years agoLog time difference between power button presses for gesture
Jorim Jaggi [Tue, 22 Sep 2015 21:44:14 +0000 (14:44 -0700)]
Log time difference between power button presses for gesture

Bug: 24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf

8 years agoMerge "Add logs for the ungaze gesture." into cw-e-dev
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 21:41:48 +0000 (21:41 +0000)]
Merge "Add logs for the ungaze gesture." into cw-e-dev

8 years agoAdd logs for the ungaze gesture.
Mojtaba [Fri, 18 Sep 2015 23:35:24 +0000 (16:35 -0700)]
Add logs for the ungaze gesture.

-We add logs to track how much screen time we save with the ungaze feature.

Change-Id: I02bce959ce7ed5bc6c848e51256063c946ff3e87

8 years agoam d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into...
Baligh Uddin [Tue, 22 Sep 2015 20:56:05 +0000 (20:56 +0000)]
am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit 'd2b597d1fdc99c512f1addfc817eea8d375a84ec':
  Enforce a timeout for Content Providers to be published.

8 years agoMerge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
Baligh Uddin [Tue, 22 Sep 2015 20:50:02 +0000 (20:50 +0000)]
Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

8 years agoDismiss color fade when it is no longer used.
Michael Lentine [Tue, 22 Sep 2015 20:02:22 +0000 (13:02 -0700)]
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

8 years agoam 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
Adam Lesinski [Tue, 22 Sep 2015 18:42:33 +0000 (18:42 +0000)]
am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
  Fix Array Index Out of Bounds in BatteryStatsImpl