Adam Lesinski
56df15d3b4
am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit '5b3a38e07dcdbae03f13a55d91a8936996ddc9cf':
Change default cellular activity timeout to 10
2015-08-19 01:32:46 +00:00
Jorim Jaggi
40c7583163
am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
Only call authenticate when we are not listening yet
2015-08-19 01:32:40 +00:00
Jim Miller
ce6fb7bba9
am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
2015-08-19 01:32:24 +00:00
Jorim Jaggi
1d9a8c58d8
am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation
...
* commit '2591d6ffc60505df0099069877f7913ec30e4460':
Do not start with a black frame in bootanimation
2015-08-19 01:32:06 +00:00
Jim Miller
309fef16e1
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 01:31:58 +00:00
Tim Kilbourn
458d4d6d7f
am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
...
* commit '9b1fd822d07a5e3c270b76b197bec7ebfadb250d':
Use init to write usb typec props.
2015-08-19 01:31:53 +00:00
Roozbeh Pournader
c91b67adba
am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
...
* commit '31a536e117ff750b49350d5dc7268239bfc2ff36':
Revert "Create a special CONSTRAINED font bucket in frameworks."
2015-08-19 01:31:43 +00:00
Dianne Hackborn
217d45685f
am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
...
* commit '8100b3fa8be63b5c3525997b35d216edfc0cd7e7':
Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
2015-08-19 01:31:27 +00:00
Adam Lesinski
5b3a38e07d
am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03':
Change default cellular activity timeout to 10
2015-08-19 00:59:10 +00:00
Jorim Jaggi
b7f482ab41
am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
Only call authenticate when we are not listening yet
2015-08-19 00:59:06 +00:00
Adam Lesinski
bda9b324c8
am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
Change default cellular activity timeout to 10
2015-08-19 00:53:35 +00:00
Jorim Jaggi
ee2cfe48d4
Only call authenticate when we are not listening yet
...
Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
2015-08-19 00:51:23 +00:00
Jim Miller
7ef772713f
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
Reset fingerprint lockout timer when strong auth is used.
2015-08-18 23:18:36 +00:00
Jim Miller
bea9d7b94c
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
2015-08-18 23:12:18 +00:00
Adam Lesinski
886e7a63b1
Merge "Change default cellular activity timeout to 10" into mnc-dev
2015-08-18 20:43:34 +00:00
Jorim Jaggi
2591d6ffc6
am 358fcc79: Do not start with a black frame in bootanimation
...
* commit '358fcc795ea567ba086a460c587de427507fefdd':
Do not start with a black frame in bootanimation
2015-08-18 20:33:08 +00:00
Jorim Jaggi
358fcc795e
Do not start with a black frame in bootanimation
...
Bug: 23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f
2015-08-18 20:26:47 +00:00
Jim Miller
e11fbc08a3
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '33a5c80773b7b2913c92fec170787499a453d184':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-18 20:15:10 +00:00
Jim Miller
33a5c80773
resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
2015-08-18 13:07:25 -07:00
Tim Kilbourn
9b1fd822d0
am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
...
* commit '2ad94499697d79dc41489ab873527411f88b3f15':
Use init to write usb typec props.
2015-08-18 20:02:47 +00:00
Jim Miller
e0507bbbf9
Reset fingerprint lockout timer when strong auth is used.
...
Fixes bug 22565462
Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00
Tim Kilbourn
2ad9449969
Merge "Use init to write usb typec props." into mnc-dr-dev
2015-08-18 19:54:46 +00:00
Roozbeh Pournader
31a536e117
am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
...
* commit '579283647e110538651fa812ceb15bc7f44e50a8':
Revert "Create a special CONSTRAINED font bucket in frameworks."
2015-08-18 19:44:49 +00:00
Roozbeh Pournader
579283647e
am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
...
* commit '53c38c8819e2497f8272e7615d34aaa4ae052adf':
Revert "Create a special CONSTRAINED font bucket in frameworks."
2015-08-18 19:37:16 +00:00
Jim Miller
448216e7b8
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
2015-08-18 19:32:01 +00:00
Roozbeh Pournader
53c38c8819
Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
2015-08-18 19:29:47 +00:00
Roozbeh Pournader
bbf0c88e6c
Revert "Create a special CONSTRAINED font bucket in frameworks."
...
This reverts commit 9e21eced5efacd605036be599d96974964deb09b.
Bug: 22929087
2015-08-18 12:17:13 -07:00
Adam Lesinski
ed6160d299
Change default cellular activity timeout to 10
...
LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.
Bug:23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca
2015-08-18 11:47:07 -07:00
Dianne Hackborn
8100b3fa8b
am 4439dcdc: am af75c17b: Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
...
* commit '4439dcdc395a9c173df1ddcf64c510eed5face07':
Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
2015-08-18 18:41:51 +00:00
Dianne Hackborn
4439dcdc39
am af75c17b: Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
...
* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
2015-08-18 18:33:25 +00:00
Dianne Hackborn
af75c17bca
Fix issue #23270878 : NPE in UsageStatsService while running UserManagementTest
...
Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
2015-08-18 11:08:10 -07:00
Sebastien Hertz
3244dc229a
am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '677cd0872013cdeb4c201ce0994633065b616725':
Allow debugging only for apps forked from zygote
2015-08-18 08:04:41 +00:00
Sebastien Hertz
677cd08720
am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit 'e9de1b4cef10922180cfe06049cf906160e2c315':
Allow debugging only for apps forked from zygote
2015-08-18 07:56:37 +00:00
Sebastien Hertz
e9de1b4cef
am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
Allow debugging only for apps forked from zygote
2015-08-18 07:50:06 +00:00
Sebastien Hertz
9a010d0a41
Merge "Allow debugging only for apps forked from zygote" into mnc-dev
2015-08-18 07:41:50 +00:00
Joe Fernandez
9b56bff4a9
am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '20a9ca1581c266ce320ea850ee6dc10719584ebf':
docs: App link doc update for M Preview 3
2015-08-18 07:41:22 +00:00
Joe Fernandez
20a9ca1581
am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit 'd294dc437d53ceb74529e62aa70078a8f51bb462':
docs: App link doc update for M Preview 3
2015-08-18 07:36:25 +00:00
Joe Fernandez
d294dc437d
am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
docs: App link doc update for M Preview 3
2015-08-18 07:28:31 +00:00
Joe Fernandez
96695d2f59
Merge "docs: App link doc update for M Preview 3" into mnc-dev
2015-08-18 07:23:35 +00:00
Joe Fernandez
94fc625cf1
docs: App link doc update for M Preview 3
...
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
2015-08-18 00:14:14 -07:00
David Friedman
878acada08
am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit 'd7792759e703200c833736df276915958588cad4':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:07:15 +00:00
David Friedman
d7792759e7
am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '5f89ce649c6385bd6463641c5408cc7a274b0eb6':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:00:50 +00:00
David Friedman
5f89ce649c
am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 04:54:58 +00:00
David Friedman
3e40a27eac
Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev
2015-08-18 04:50:23 +00:00
Filip Gruszczynski
d29dd0c986
am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'b59404a1f590091f0c3cd22b69de1b55154ef580':
Clear old clip rect when creating new surface.
2015-08-18 02:25:00 +00:00
Filip Gruszczynski
b59404a1f5
am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'eb2f302d119faaaf5d63f23f0921da9d756da5b4':
Clear old clip rect when creating new surface.
2015-08-18 02:19:51 +00:00
Filip Gruszczynski
eb2f302d11
am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit '610008c0ebf5ea4556b4825eac521b2b16f1a66c':
Clear old clip rect when creating new surface.
2015-08-18 02:12:47 +00:00
Filip Gruszczynski
610008c0eb
Merge "Clear old clip rect when creating new surface." into mnc-dev
2015-08-18 02:04:57 +00:00
David Friedman
eaabddf121
Docs: Fixing files that didn't merge properly from mnc-preview-docs
...
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
2015-08-17 18:45:36 -07:00
Dianne Hackborn
cfd288b858
am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit '5211c0630bc5ab3026dd29e1640ddc83590e3219':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:41:45 +00:00
