Commit Graph

235150 Commits

Author SHA1 Message Date
Selim Cinek
df72e80b03 Merge "Fixed a bug with public notifications" into nyc-dev am: 5a25783d33
am: 3b07c7f5e6

* commit '3b07c7f5e6d8fb58f18705b6af415e9a005bf40d':
  Fixed a bug with public notifications
2016-02-23 01:33:53 +00:00
Selim Cinek
5ef30d5b0c Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev am: dd9a8017e4
am: 8f03754ad4

* commit '8f03754ad42419d7f8e888c4cf4c8f415dce6e25':
  Fixed a bug where the dozemode was incorrectly applied
2016-02-23 01:32:08 +00:00
Selim Cinek
0efe38d743 Merge "Made the Chronometer able to count downwards" into nyc-dev am: f1c6371587
am: 5cf8722f94

* commit '5cf8722f94021f0eb5078fceece80182a65144a8':
  Made the Chronometer able to count downwards
2016-02-23 01:18:13 +00:00
Chris Craik
1c1a99f790 Merge "Fix positioning in path fallback case" into nyc-dev am: cf1f7304ca
am: 171079af05

* commit '171079af05295f069b29325c5f344bf768692f81':
  Fix positioning in path fallback case
2016-02-23 01:16:02 +00:00
Suprabh Shukla
4d4726e06e Merge "Moving recent tasks and images to /data/system_ce" into nyc-dev am: 827d0d06e6
am: 07418b2645

* commit '07418b264574016c6c5a5abe6958eb1ad0006eb9':
  Moving recent tasks and images to /data/system_ce
2016-02-23 01:13:17 +00:00
Selim Cinek
3b07c7f5e6 Merge "Fixed a bug with public notifications" into nyc-dev
am: 5a25783d33

* commit '5a25783d3314a059c2b448b34e41aafcc78bbb10':
  Fixed a bug with public notifications
2016-02-23 01:11:32 +00:00
Selim Cinek
8f03754ad4 Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev
am: dd9a8017e4

* commit 'dd9a8017e4934007fc5338e2c68b199cd6220001':
  Fixed a bug where the dozemode was incorrectly applied
2016-02-23 01:09:06 +00:00
Selim Cinek
5cf8722f94 Merge "Made the Chronometer able to count downwards" into nyc-dev
am: f1c6371587

* commit 'f1c6371587ba9349068092971f1fdf85596d0461':
  Made the Chronometer able to count downwards
2016-02-23 01:07:06 +00:00
Chris Craik
171079af05 Merge "Fix positioning in path fallback case" into nyc-dev
am: cf1f7304ca

* commit 'cf1f7304cae8bcd35b83d1c40ee38f7e1433ea9b':
  Fix positioning in path fallback case
2016-02-23 01:05:25 +00:00
Suprabh Shukla
07418b2645 Merge "Moving recent tasks and images to /data/system_ce" into nyc-dev
am: 827d0d06e6

* commit '827d0d06e6904a0ca09354a030e6e4bbe66354d3':
  Moving recent tasks and images to /data/system_ce
2016-02-23 01:03:41 +00:00
Selim Cinek
5a25783d33 Merge "Fixed a bug with public notifications" into nyc-dev 2016-02-23 00:55:49 +00:00
Selim Cinek
dd9a8017e4 Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev 2016-02-23 00:55:38 +00:00
Selim Cinek
f1c6371587 Merge "Made the Chronometer able to count downwards" into nyc-dev 2016-02-23 00:55:26 +00:00
Chris Craik
cf1f7304ca Merge "Fix positioning in path fallback case" into nyc-dev 2016-02-23 00:54:29 +00:00
Suprabh Shukla
827d0d06e6 Merge "Moving recent tasks and images to /data/system_ce" into nyc-dev 2016-02-23 00:53:06 +00:00
Yang Ren
f00f3642f3 Merge "TIF: Add information of TvInputHardwareManager to dumpsys" into nyc-dev am: a856a70eaa
am: 54ef4a2d73

* commit '54ef4a2d73c807b85ae50e9f383c801a2e67b7db':
  TIF: Add information of TvInputHardwareManager to dumpsys
2016-02-23 00:49:05 +00:00
Chris Craik
e2822e4c79 Fix positioning in path fallback case
bug:26923968
Change-Id: Iaf686fb69b629cf5c8762188073e57c8664150a8
2016-02-22 16:42:24 -08:00
Yang Ren
54ef4a2d73 Merge "TIF: Add information of TvInputHardwareManager to dumpsys" into nyc-dev
am: a856a70eaa

* commit 'a856a70eaa3bc7524109011a8f340413b561165b':
  TIF: Add information of TvInputHardwareManager to dumpsys
2016-02-23 00:42:10 +00:00
Yang Ren
a856a70eaa Merge "TIF: Add information of TvInputHardwareManager to dumpsys" into nyc-dev 2016-02-23 00:35:25 +00:00
Abhijith Shastry
7d5c28e8e2 Merge "Rename suppressal to suppression." into nyc-dev am: 3b31ddd517
am: 76a4f428ad

* commit '76a4f428adc20e9f642436af043e41aaa1d97c68':
  Rename suppressal to suppression.
2016-02-23 00:28:42 +00:00
Tim Murray
670f315849 Bind background services to the top app correctly. am: ba212c6bef
am: f52dfd372f

* commit 'f52dfd372f98cac53f5f0065657b499538aa8e6d':
  Bind background services to the top app correctly.
2016-02-23 00:22:14 +00:00
Abhijith Shastry
76a4f428ad Merge "Rename suppressal to suppression." into nyc-dev
am: 3b31ddd517

* commit '3b31ddd5173c1407b5644aaa618c356e19f43024':
  Rename suppressal to suppression.
2016-02-23 00:21:55 +00:00
Jae Seo
c412e925c4 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev am: af326ed2b9
am: 43ddc14d5d

* commit '43ddc14d5da7e9432d4847fe3485a5cd42b783cc':
  TIF: Add android.permission.READ_TV_LISTINGS
2016-02-23 00:14:11 +00:00
Abhijith Shastry
3b31ddd517 Merge "Rename suppressal to suppression." into nyc-dev 2016-02-23 00:11:27 +00:00
Tim Murray
f52dfd372f Bind background services to the top app correctly.
am: ba212c6bef

* commit 'ba212c6bef6bc3601e95b0360088573097e52401':
  Bind background services to the top app correctly.
2016-02-23 00:09:37 +00:00
Abhijith Shastry
4478fdc3f2 Rename suppressal to suppression.
BUG: 26989170
Change-Id: Iafa21b885f7df7f5ec5e46f3fad095cf1a531cfc
2016-02-22 16:07:14 -08:00
Selim Cinek
e4c068d258 Fixed a bug with public notifications
Public notification titles were incorrectly modified when
the notification wasn't autoredacted (i.e screenshot).
This also lead to the doze mode not working correctly anymore
as notifications were colored.

Bug: 24866646
Change-Id: I3d4cdb0e13cfbf3fb8082b930936260d7c4749af
2016-02-22 15:57:01 -08:00
Selim Cinek
0934bd9942 Fixed a bug where the dozemode was incorrectly applied
This could lead to invisible white text.

Bug: 27147160
Change-Id: I1196c251c795a7e271545405fb3936bcbb84cb19
2016-02-22 15:57:00 -08:00
Selim Cinek
ed1a33cc86 Made the Chronometer able to count downwards
Bug: 26862188
Change-Id: I3a4a34ffccdbcbcb8001b1894ce47bb75b11821d
2016-02-22 15:56:56 -08:00
Jae Seo
43ddc14d5d Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev
am: af326ed2b9

* commit 'af326ed2b9e35dbd60fbe44d13f8ca7738c97340':
  TIF: Add android.permission.READ_TV_LISTINGS
2016-02-22 23:50:22 +00:00
Tim Murray
ba212c6bef Bind background services to the top app correctly.
bug 27187310

Change-Id: I7d1ff989d7d36319b12dc20e3b25a47303729600
2016-02-22 15:48:28 -08:00
Yohei Yukawa
3a207f9e3d Merge "Fix build breakage." into nyc-dev am: 4449a27fe9
am: 0079d93dba

* commit '0079d93dba10b0fede2a6bf960455436cf77a773':
  Fix build breakage.
2016-02-22 23:45:10 +00:00
Jae Seo
af326ed2b9 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-22 23:44:48 +00:00
Sami Tolvanen
8de9750d64 Merge "Support persist.sys.audit_safemode" into nyc-dev am: 436f1523d1
am: a04f1b4e4e

* commit 'a04f1b4e4e549e115f11f8e0fb561d0a9542c17e':
  Support persist.sys.audit_safemode
2016-02-22 23:37:59 +00:00
Yohei Yukawa
0079d93dba Merge "Fix build breakage." into nyc-dev
am: 4449a27fe9

* commit '4449a27fe9f518be2c181307c14f28278026ab84':
  Fix build breakage.
2016-02-22 23:33:10 +00:00
Sami Tolvanen
a04f1b4e4e Merge "Support persist.sys.audit_safemode" into nyc-dev
am: 436f1523d1

* commit '436f1523d10ff330069e1e9951172d4f6d8d806b':
  Support persist.sys.audit_safemode
2016-02-22 23:31:25 +00:00
Chris Tate
1d1beb4dcf Merge "Limit scheduled jobs to 100 per app" into nyc-dev am: 3e30b118f7
am: 21a7ef469f

* commit '21a7ef469fe6cb4f6ed569f75f2ee36676bad9bb':
  Limit scheduled jobs to 100 per app
2016-02-22 23:24:38 +00:00
Yohei Yukawa
4449a27fe9 Merge "Fix build breakage." into nyc-dev 2016-02-22 23:22:45 +00:00
Sami Tolvanen
436f1523d1 Merge "Support persist.sys.audit_safemode" into nyc-dev 2016-02-22 23:22:30 +00:00
Suprabh Shukla
4bccb46554 Moving recent tasks and images to /data/system_ce
Moved user sensitive recents data to the credential encrypted directory
/data/system_ce. Since this directory is not available before the user
is unlocked, and unavailable task ids are needed to be known before
assigning an id to a new task, this change adds a file in /data/system_de
for each user, to store the ids of the tasks present in /data/system_ce.

Bug: b/24569398
Change-Id: I340d1abe23e2594e2cee4bff89a697bd8dc61fc7
2016-02-22 15:19:11 -08:00
Chris Tate
21a7ef469f Merge "Limit scheduled jobs to 100 per app" into nyc-dev
am: 3e30b118f7

* commit '3e30b118f7bf09955ded313109b0de540c28985b':
  Limit scheduled jobs to 100 per app
2016-02-22 23:15:28 +00:00
Shawn Willden
d76e2855e5 Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev am: b094ebf18a
am: c7c55dbc67

* commit 'c7c55dbc67fab095441a7e15c3755e663d5d4dc8':
  Revert "Add option to allow key validity after fingerprint enrollment."
2016-02-22 23:15:17 +00:00
Yohei Yukawa
5cf733f89b Fix build breakage.
This follows up to my previous CL [1], which forgot to update
BridgeIInputMethodManager.java (again!).

  [1] I56934f18e30d90fcdf77bcbb0c35a92a5feb1b82
      05c25f8a3a

Bug: 25373872
Change-Id: I0643069fd0b677115c89c340b7a23f1d12bd7988
2016-02-22 15:11:49 -08:00
Chris Tate
3e30b118f7 Merge "Limit scheduled jobs to 100 per app" into nyc-dev 2016-02-22 23:10:25 +00:00
Shawn Willden
c7c55dbc67 Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev
am: b094ebf18a

* commit 'b094ebf18a7e97cfe1e9de8b48af0bf605355419':
  Revert "Add option to allow key validity after fingerprint enrollment."
2016-02-22 23:08:34 +00:00
Akshay Thakker
fe6a5cab55 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c99809 am: 768e1df375 am: 7e65e5c681 -s ours am: 5d35396a53
am: 537fd76aa6  -s ours

* commit '537fd76aa680ffffe9f74516a02f090d42440dfa':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
2016-02-22 23:06:54 +00:00
Shawn Willden
b094ebf18a Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev 2016-02-22 23:00:50 +00:00
Akshay Thakker
537fd76aa6 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c99809 am: 768e1df375 am: 7e65e5c681 -s ours
am: 5d35396a53

* commit '5d35396a5320670ca7460deed11f1fd5338bd623':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
2016-02-22 22:59:51 +00:00
Shawn Willden
512c132f49 Revert "Add option to allow key validity after fingerprint enrollment."
This reverts commit ada0fc1b05.

Change-Id: I934b6e6af49ab680af726c544f0193dfcb80054e
2016-02-22 22:59:34 +00:00
Chris Tate
c0d1f99c86 Merge "Implement wildcard-host policy in reference autoVerify implementation" into nyc-dev am: 737a1c1053
am: 0932809357

* commit '0932809357e087b28f43d59013fef0d9678ee8e5':
  Implement wildcard-host policy in reference autoVerify implementation
2016-02-22 22:54:11 +00:00