OSDN Git Service
Ian Pedowitz [Fri, 25 Sep 2015 18:09:35 +0000 (18:09 +0000)]
am
4c74a02e: am
3af6163a: am
31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
* commit '
4c74a02eea04c5faa541812607a5782505bacf00':
Give the DhcpClient alarm broadcasts foreground priority.
Joe LaPenna [Fri, 25 Sep 2015 18:09:16 +0000 (18:09 +0000)]
am
5d05db28: (-s ours) am
ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
* commit '
5d05db28773dc0b242d8f894abd65f6b3c2a17c4':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
Jorim Jaggi [Fri, 25 Sep 2015 18:09:07 +0000 (18:09 +0000)]
am
1727a8e0: am
31519f63: am
ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
* commit '
1727a8e0ea3334efd7ce07d7b7a0130e1f485f01':
Do not issue config change command when not needed
Pankaj Kanwar [Fri, 25 Sep 2015 18:08:59 +0000 (18:08 +0000)]
am
52762ce8: am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
52762ce874200ad2fdbe24fa83ebf8ef6cbf08a4':
AudioService: cleanup sco audio mode upon disconnection.
Baligh Uddin [Fri, 25 Sep 2015 18:08:32 +0000 (18:08 +0000)]
am
8403b9b7: (-s ours) am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8403b9b7262527a27c7f77901ba4bb7d52a5c301':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:26 +0000 (18:08 +0000)]
am
b4f7abbd: (-s ours) am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:20 +0000 (18:08 +0000)]
am
c266a512: (-s ours) am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c266a512cc4d4d844d152ad0ea8086966ee26dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:14 +0000 (18:08 +0000)]
am
fdfd01be: (-s ours) am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fdfd01bef34ada326ff502f327e4387b8b14aa81':
Import translations. DO NOT MERGE
Jorim Jaggi [Fri, 25 Sep 2015 18:07:52 +0000 (18:07 +0000)]
am
f9f9999d: am
b7b9b31f: am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
Michael Lentine [Fri, 25 Sep 2015 18:07:41 +0000 (18:07 +0000)]
am
a86465d7: am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
a86465d7af8c8995210166954ec42624560bf86e':
Revert "Dismiss color fade when it is no longer used."
Ian Pedowitz [Fri, 25 Sep 2015 17:17:25 +0000 (17:17 +0000)]
am
3af6163a: am
31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
* commit '
3af6163a66dceb7a6e6e300f5f8de828c88919d4':
Give the DhcpClient alarm broadcasts foreground priority.
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.
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
Joe LaPenna [Fri, 25 Sep 2015 09:40:15 +0000 (09:40 +0000)]
am
ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
* commit '
ac342d3831991060c1ccac26aaa764e0a9ae7e15':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
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
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
Jorim Jaggi [Fri, 25 Sep 2015 07:11:24 +0000 (07:11 +0000)]
am
31519f63: am
ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
* commit '
31519f637d3373ff8546360742a4b05706f0ad61':
Do not issue config change command when not needed
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
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:51:38 +0000 (04:51 +0000)]
am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
f99986eec6a263e74833d26dc8dcb107b15a9c04':
AudioService: cleanup sco audio mode upon disconnection.
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.
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 03:11:40 +0000 (03:11 +0000)]
am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
437ee52a65e609ffce91aff8eff438ebc73d9105':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:34 +0000 (03:11 +0000)]
am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:26 +0000 (03:11 +0000)]
am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
6a39ee4db5f81795cbbfce0c2a864d619e860d88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:16 +0000 (03:11 +0000)]
am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
683db0306cfd756ff96fabbd0de07fa8b0184483':
Import translations. DO NOT MERGE
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
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
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
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
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 01:38:07 +0000 (01:38 +0000)]
am
b7b9b31f: am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
b7b9b31f6969dc48174757ec236622f8d49222d0':
Deliver camera launch source for analytics
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: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
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:48:02 +0000 (00:48 +0000)]
am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
8c7436558fa61b5ce9e82116b6b385f8f246d87e':
Revert "Dismiss color fade when it is no longer used."
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."
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 [Fri, 25 Sep 2015 00:08:22 +0000 (00:08 +0000)]
am
2ce4fb0c: 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 '
2ce4fb0c1f4824981f6ed03135bf513d98fb3153':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:59:45 +0000 (23:59 +0000)]
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
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
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
Todd Kennedy [Thu, 24 Sep 2015 21:48:50 +0000 (21:48 +0000)]
am
4e321745: resolved conflicts for
cafacef6 to stage-aosp-master
* commit '
4e321745173de1eb89343238fadfbcc7ba1a88f9':
Frameworks/base: Propagate boot status to installd
Todd Kennedy [Thu, 24 Sep 2015 21:34:06 +0000 (14:34 -0700)]
resolved conflicts for
cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
Todd Kennedy [Thu, 24 Sep 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Frameworks/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
(cherry picked from commit
06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Sean Young [Thu, 24 Sep 2015 19:01:33 +0000 (19:01 +0000)]
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.
Sean Young [Thu, 24 Sep 2015 18:55:50 +0000 (18:55 +0000)]
Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
Jorim Jaggi [Thu, 24 Sep 2015 18:20:57 +0000 (18:20 +0000)]
am
2d48a93f: am
98a8c7c5: am
e1de9f67: Fix black Keyguard
* commit '
2d48a93fea89cbdaae8e6cb718dbc382e35764df':
Fix black Keyguard
Jorim Jaggi [Thu, 24 Sep 2015 18:14:42 +0000 (18:14 +0000)]
am
98a8c7c5: am
e1de9f67: Fix black Keyguard
* commit '
98a8c7c553108e6d6f6260ae5c1f05d8a6c8af10':
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
Jeff Hao [Thu, 24 Sep 2015 17:47:56 +0000 (17:47 +0000)]
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.
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
Jeff Hao [Thu, 24 Sep 2015 17:39:34 +0000 (17:39 +0000)]
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.
Jeff Hao [Thu, 24 Sep 2015 17:30:25 +0000 (17:30 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU."
Jeff Hao [Wed, 23 Sep 2015 20:57:30 +0000 (13:57 -0700)]
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
Elliott Hughes [Thu, 24 Sep 2015 17:14:10 +0000 (17:14 +0000)]
am
b57dd722: resolved conflicts for
a884d81e to stage-aosp-master
* commit '
b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
Elliott Hughes [Thu, 24 Sep 2015 17:01:32 +0000 (10:01 -0700)]
resolved conflicts for
a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
Elliott Hughes [Thu, 24 Sep 2015 16:01:15 +0000 (16:01 +0000)]
Merge "constify JNINativeMethod function pointer tables"
Vinit Deshpande [Thu, 24 Sep 2015 04:26:03 +0000 (04:26 +0000)]
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
Vinit Deshpande [Thu, 24 Sep 2015 04:17:40 +0000 (04:17 +0000)]
am
de02fe2a: am
629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '
de02fe2afdc835eca72bb05a1514daa439bb2b40':
Disable wifi firmware logging by default
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
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 02:41:36 +0000 (02:41 +0000)]
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
Jorim Jaggi [Thu, 24 Sep 2015 02:29:01 +0000 (02:29 +0000)]
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
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
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
Deepanshu Gupta [Wed, 23 Sep 2015 23:17:22 +0000 (23:17 +0000)]
am
51a05d74: Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
* commit '
51a05d74a81aeb334ef095fc6f1aa98e5163763f':
Fix TypedArray.getTextArray()
Deepanshu Gupta [Wed, 23 Sep 2015 23:05:06 +0000 (23:05 +0000)]
Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
Deepanshu Gupta [Wed, 23 Sep 2015 22:57:43 +0000 (15:57 -0700)]
Fix TypedArray.getTextArray()
Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
Jorim Jaggi [Wed, 23 Sep 2015 19:12:41 +0000 (19:12 +0000)]
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
Jorim Jaggi [Wed, 23 Sep 2015 19:03:26 +0000 (19:03 +0000)]
am
1bcb3472: am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
1bcb3472669529edc991a31e6cbf7866a385383e':
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
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 18:30:57 +0000 (18:30 +0000)]
am
8faa9e9e: am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
8faa9e9e349011aebab6527476e315f6a5f610e4':
save "retain loader" state
Todd Kennedy [Wed, 23 Sep 2015 18:12:03 +0000 (18:12 +0000)]
am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
898e6973ca198f327059d331b4d83b1d183d5fb1':
save "retain loader" state
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
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 17:53:09 +0000 (17:53 +0000)]
am
a2e47e2f: am
d737f715: 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 '
a2e47e2fbc66eebef5cf94405518882158ac2b15':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:53:03 +0000 (17:53 +0000)]
am
88674941: am
6a728e17: 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 '
88674941e1cb506554e23d7f44170c5829094615':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:52:58 +0000 (17:52 +0000)]
am
1584eefe: (-s ours) am
eb1e4b14: (-s ours) am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1584eefebd2de1bcce0e589ee6414df4bade07b9':
Import translations. DO NOT MERGE
OSDN Git Service
