OSDN Git Service

android-x86/frameworks-base.git
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 01:40:38 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE

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

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 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 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 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 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 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 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 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 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 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 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 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 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 "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 agoMerge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
Adam Lesinski [Tue, 22 Sep 2015 18:33:14 +0000 (18:33 +0000)]
Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

8 years agoMerge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
Andreas Gampe [Tue, 22 Sep 2015 18:27:39 +0000 (18:27 +0000)]
Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev

8 years agosave "retain loader" state
Todd Kennedy [Thu, 10 Sep 2015 20:58:01 +0000 (13:58 -0700)]
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

8 years agoExtended the maximum pulsing duration when dozing
Selim Cinek [Tue, 22 Sep 2015 08:05:29 +0000 (10:05 +0200)]
Extended the maximum pulsing duration when dozing

Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6

8 years agoFix Array Index Out of Bounds in BatteryStatsImpl
Adam Lesinski [Mon, 21 Sep 2015 23:54:52 +0000 (16:54 -0700)]
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

8 years agoFrameworks/base: Propagate boot status to installd
Andreas Gampe [Mon, 21 Sep 2015 20:20:07 +0000 (13:20 -0700)]
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

8 years agoam fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf99...
Zach Jang [Mon, 21 Sep 2015 21:37:34 +0000 (21:37 +0000)]
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

8 years agoam 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e4...
Zach Jang [Mon, 21 Sep 2015 21:37:30 +0000 (21:37 +0000)]
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

8 years agoam 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2...
Zach Jang [Mon, 21 Sep 2015 21:30:32 +0000 (21:30 +0000)]
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

8 years agoam 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT...
Zach Jang [Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)]
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

8 years agoam ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09...
Zach Jang [Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)]
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

8 years agoam b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag...
Zach Jang [Mon, 21 Sep 2015 21:06:58 +0000 (21:06 +0000)]
am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam e1a6299b: Relax locking when scanning private volumes.
Jeff Sharkey [Mon, 21 Sep 2015 20:29:58 +0000 (20:29 +0000)]
am e1a6299b: Relax locking when scanning private volumes.

* commit 'e1a6299b994bbdb304550e00d5b3b26a064bdf0c':
  Relax locking when scanning private volumes.

8 years agoam f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f35...
Zach Jang [Mon, 21 Sep 2015 19:10:51 +0000 (19:10 +0000)]
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 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp...
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT...
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
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 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoEnforce a timeout for Content Providers to be published.
Robert Carr [Thu, 17 Sep 2015 17:54:58 +0000 (10:54 -0700)]
Enforce a timeout for Content Providers to be published.

ActivityManagerService: In the case where we are launching
an application on behalf of a Content Provider request,
enforce a timeout inbetween the application attaching and
the content providers being published. Consider that a defective
content provider may block in ContentProvider::onCreate
indefinitely: in such a case the PROC_START_TIMEOUT has already
been removed as the activity manager must have called bindApplication.

In these cases, there will be nothing to wake threads blocking
on the (non timed) wait for provider to be published at the end of
ActivityManagerService::getContentProviderImpl. This can cause binder
threads to block 1 by 1 until eventually AMS runs out and becomes
unresponsive.

Bug: 22141958
Change-Id: I2226da5df5c79b37f0b896423b3c1eaa4a7ecbba
(cherry picked from commit da33c13434cb20a11b522374411a5b819503e4e0)

8 years agoFix reintroduction of b/10845061
Soonil Nagarkar [Fri, 10 Jul 2015 18:12:30 +0000 (11:12 -0700)]
Fix reintroduction of b/10845061

Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)

8 years agoGrab a wakelock while doing ARP/ND probing
Erik Kline [Fri, 18 Sep 2015 03:21:56 +0000 (12:21 +0900)]
Grab a wakelock while doing ARP/ND probing

Bug: 23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:45:29 +0000 (02:45 +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 [Sat, 19 Sep 2015 02:45:16 +0000 (02:45 +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 [Sat, 19 Sep 2015 02:44:50 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:47 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:44 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:42 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:39 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:35 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:31 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:28 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:25 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:44:23 +0000 (02:44 +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 [Sat, 19 Sep 2015 02:43:21 +0000 (02:43 +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 [Sat, 19 Sep 2015 02:35:14 +0000 (02:35 +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 [Sat, 19 Sep 2015 02:35:12 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Add support for setting color transforms" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:21:41 +0000 (00:21 +0000)]
Merge "Add support for setting color transforms" into mnc-dr-dev

8 years agoMerge "Always set the usb config when modifying it." into mnc-dr-dev
Tim Kilbourn [Fri, 18 Sep 2015 23:55:56 +0000 (23:55 +0000)]
Merge "Always set the usb config when modifying it." into mnc-dr-dev

8 years agoAdd support for setting color transforms
Michael Wright [Mon, 14 Sep 2015 23:13:26 +0000 (00:13 +0100)]
Add support for setting color transforms

Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536

8 years agoMerge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
Vineeta Srivastava [Fri, 18 Sep 2015 22:19:41 +0000 (22:19 +0000)]
Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev

8 years agoMerge "Fix crash when no power_profile is specified" into mnc-dr-dev
Adam Lesinski [Fri, 18 Sep 2015 22:15:19 +0000 (22:15 +0000)]
Merge "Fix crash when no power_profile is specified" into mnc-dr-dev

8 years agoset config_use_sim_language_file false for SE Telia/Sweden 3G
sangjoon84.lee [Fri, 18 Sep 2015 08:50:55 +0000 (17:50 +0900)]
set config_use_sim_language_file false for SE Telia/Sweden 3G

BUG=24184934

Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d

8 years agoAlways set the usb config when modifying it.
Tim Kilbourn [Fri, 18 Sep 2015 21:57:28 +0000 (14:57 -0700)]
Always set the usb config when modifying it.

On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.

Bug: 23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3

8 years agoFix crash when no power_profile is specified
Adam Lesinski [Fri, 18 Sep 2015 21:56:34 +0000 (14:56 -0700)]
Fix crash when no power_profile is specified

Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 21:17:59 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 21:15:54 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 21:06:53 +0000 (14:06 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 21:04:36 +0000 (14:04 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 21:02:31 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 20:57:25 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE

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