OSDN Git Service
Deepanshu Gupta [Fri, 2 May 2014 19:19:55 +0000 (19:19 +0000)]
am
582bb0dc: am
fbb1561a: am
44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '
582bb0dc7498997f441c5209b1558a4640b5a107':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:52 +0000 (19:19 +0000)]
am
10fd7f6b: am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
10fd7f6b4192fdbd847106fb0d9ec87095092ee3':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:48 +0000 (19:19 +0000)]
am
23726255: am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
237262558b818ce52ec53281f2270be3e4f1ee28':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:46 +0000 (19:19 +0000)]
am
f5512973: am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
f55129731005f6939d40d7c8a0c0f8c93b472f98':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:42 +0000 (19:19 +0000)]
am
9a1f13a4: am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
9a1f13a47bfe29e344efc05f0ecabbfcb5671e06':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:39 +0000 (19:19 +0000)]
am
b80247d3: am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
b80247d351b88f69192260a661dbf3d4d71e9527':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:36 +0000 (19:19 +0000)]
am
b27d8814: am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
b27d881467869539a5c8ec2510e8415912abb617':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:59 +0000 (19:15 +0000)]
am
fbb1561a: am
44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '
fbb1561a483b455aa840c69c391c3bbd1a529981':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:56 +0000 (19:15 +0000)]
am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
ca2c6307263b3857ba688c80277fef402215db18':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:52 +0000 (19:15 +0000)]
am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
77d1eca7d2acf68f246970e59a50e8a6e1c03e20':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:50 +0000 (19:15 +0000)]
am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
fe67544161d44d54c8462c44c78fe290f2195f2e':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:46 +0000 (19:15 +0000)]
am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
afc623e34e5a2bd375da00a52c3c393d5049a1d1':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:43 +0000 (19:15 +0000)]
am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
811b331ae2334161c6082f666d7b3bab788f69a3':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:40 +0000 (19:15 +0000)]
am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
21cf98438b77ab58d6c781e09aecb8ad0f682042':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:34 +0000 (19:12 +0000)]
am
44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '
44bcd64e5b9fd211dd56b0598693a0559f65dc1a':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:30 +0000 (19:12 +0000)]
am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
87be67f91719234cbd381ff0242b5efc8b6aa257':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:27 +0000 (19:12 +0000)]
am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
7b5d54f05be61a7ab40021644a91c466e2897627':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:23 +0000 (19:12 +0000)]
am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
ce22440d4ca94009a4fb22c3d4f924cfbf422a66':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:18 +0000 (19:12 +0000)]
am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
bd9e181b291af34f9d70db42715136f3c16ddbde':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:16 +0000 (19:12 +0000)]
am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
d4875e19f5b7c69226783b0a6590831466159f84':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:12 +0000 (19:12 +0000)]
am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
d1084cc02549dc9ee67c879f78ae929095ec19b6':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Tue, 15 Oct 2013 01:14:58 +0000 (18:14 -0700)]
Fix CalendarView to show the right labels. [DO NOT MERGE]
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit
083e3caf66c21f7cc9511db479726c38d90e2d2f)
Deepanshu Gupta [Thu, 17 Oct 2013 03:27:51 +0000 (20:27 -0700)]
Fix layoutlib [DO NOT MERGE]
Fix a NPE.
The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.
Bug:
11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from
28873c1f008f4fe24441923e14f30e55d6f0967a)
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit
54d88f7678387a6eb871ec2dccd36af4ff35b1fe)
Deepanshu Gupta [Fri, 12 Jul 2013 18:38:05 +0000 (11:38 -0700)]
Fix text rendering [DO NOT MERGE]
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
(cherry picked from commit
92a169fa2e1bab7d93089196c33c2de12f9eae82)
Deepanshu Gupta [Thu, 20 Jun 2013 00:29:12 +0000 (17:29 -0700)]
Fix layout rendering for RTL locales [DO NOT MERGE]
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.
Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
(cherry picked from commit
eee0ea7a0b85ea6345eb7b8da5dbf17306c7339c)
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Update the configuration with the device orientation before rendering.
Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit
d97d60c0fa4613a47d591d45736299702be1cc7a)
Deepanshu Gupta [Thu, 23 May 2013 22:20:04 +0000 (15:20 -0700)]
Add missing native methods. [DO NOT MERGE]
Also contains fixes for native methods specific to the branch.
Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
(cherry-picked from commit:
279c00e8e0abb20f7e10577c77937c058da080bf)
Kenny Root [Fri, 18 Apr 2014 22:37:38 +0000 (22:37 +0000)]
am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:31:08 +0000 (22:31 +0000)]
am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:26:03 +0000 (22:26 +0000)]
am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:21:37 +0000 (22:21 +0000)]
am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:14:14 +0000 (22:14 +0000)]
am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 21:33:04 +0000 (21:33 +0000)]
am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 17:12:40 +0000 (17:12 +0000)]
Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Thu, 17 Apr 2014 21:03:31 +0000 (14:03 -0700)]
Use hidden API to validate APK chains
Bug:
13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Craig Mautner [Tue, 1 Apr 2014 19:43:41 +0000 (19:43 +0000)]
am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:36:48 +0000 (19:36 +0000)]
am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
1cb3c1d381c389c7ef903c1a871ff695cd406da4':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:30:41 +0000 (19:30 +0000)]
am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)]
am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
7bd0b65233d0ef34114ecb93d734dfe4351f470d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:18:36 +0000 (19:18 +0000)]
am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:05:11 +0000 (12:05 -0700)]
Fix FLAG_DISMISS_KEYGUARD not working
Fixes bug
13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
Brian Carlstrom [Thu, 27 Mar 2014 21:50:06 +0000 (14:50 -0700)]
Revert "Remove doSingleCrunch call DO NOT MERGE"
This reverts commit
3944abbb506bb94d8e70b8b62f30225777f50648.
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
41bb0637ca430808ab40a0300467ea58ae0a05c3':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
76e85eec845ff3688e6fd5b7bafbb5934530df4b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
3bc9971d707839f2d26e601082d654242295002d':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
95d6e32bc3c5382740a6bb418f77cf7147d833f7':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
86f9a93e20bf33b9f5152592f4781bd253be8643':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.
Fixes bug
13225149.
Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Victoria Lease [Wed, 19 Mar 2014 22:03:28 +0000 (15:03 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:57:36 +0000 (14:57 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am
31912122: am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
3191212259b1629cf8174416adf01522b88501ad':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:40:17 +0000 (14:40 -0700)]
am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)]
am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am
1c12f9e7: malloc some advances
* commit '
1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
500ec9ce4b7856eca480c4c7dca8df1211614102':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
25fb7133901f6a538d5d365f3c0c1c936e76679d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
d3da8f711ec642322e497a493985bed5c43f597b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ecba937b005b07d72eadfaf93a200e0b14af2980':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 17:33:14 +0000 (18:33 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
91c9561cbe665f91e1665f30362c409ae180b127)
Bug:
13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
Victoria Lease [Mon, 17 Mar 2014 23:03:28 +0000 (16:03 -0700)]
malloc some advances
Bug:
13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit
3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/
Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
Craig Mautner [Thu, 13 Mar 2014 18:01:13 +0000 (11:01 -0700)]
am
20a4f490: am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
20a4f490957407b9534fc453833de2fe2f276426':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:58:11 +0000 (10:58 -0700)]
am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
817f5586053ae135a59cd0768980ca741e9215b0':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:55:31 +0000 (10:55 -0700)]
am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
3d958f81c54252b452631ea1bb6e7954fc7066c8':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)]
am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
468e8e9873d764c090576d70aebf658e3e89bbfe':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:47:49 +0000 (10:47 -0700)]
am
1f52437d: Show the keyguard if unsecure window on top
* commit '
1f52437de9aa6089a72c7c992f9e7291a6a96115':
Show the keyguard if unsecure window on top
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.
(cherry picked from commit
ab55e524b89c13082193940a5bf8480a2c2522d9)
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
Paul Lawrence [Thu, 27 Feb 2014 19:44:37 +0000 (11:44 -0800)]
am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:40:21 +0000 (11:40 -0800)]
am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
08ee74b1f1c4df28faa4168114853836cc471095':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
ea5586ef7fc29463f8144931c2c43261d15043b1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
4be7c61a339f8200527f6df5a7b2215c96f81b4b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:24:05 +0000 (11:24 -0800)]
am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
5677513b7c46ca08a7fa34b9d227d7a448db6757':
Prevent authenticators from using Settings to launch arbitrary activities.
OSDN Git Service
