Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,707 Commits 3 Branches 0 Tags
d8e548f6ea5e185bd0f9e22acef9355f5307245d
Commit Graph

249707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
d8e548f6ea DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours 
am: d39c0a8d77

* commit 'd39c0a8d775988bfbf319777b2a17af1579b531a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I9c00a5b9fad92fef7fd5c0f6759b7c675e3353c9
 2016-05-26 18:04:52 +00:00
Christopher Tate
d39c0a8d77 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 
am: 0905c8f398  -s ours

* commit '0905c8f3989ab607b659fdc20a1b9a56794d2b6f':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I6d0b878ea43d98761b93865604e8cb97410cdea9
 2016-05-26 17:56:38 +00:00
Teng-Hui Zhu
b076ee0a42 Merge "Update the light center when the root view\'s layout changed" into nyc-dev 
am: e78ba24c17

* commit 'e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
  Update the light center when the root view's layout changed

Change-Id: I03e6d183e2a98b4d08f1e5be74447ddf942e8337
 2016-05-26 17:53:31 +00:00
Phil Burk
4eccbbf926 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev 
am: d34d06606d

* commit 'd34d06606dd5be9fc18029e87cb4b56ecef21864':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I9a656fe5e1ab598994f7a03984510cb1e9387f01
 2016-05-26 17:53:19 +00:00
Rubin Xu
5ce70998d0 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev 
am: 1ad12e0678

* commit '1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: Ib314b589c8b71f87a805051ae3265f752a672c0b
 2016-05-26 17:53:07 +00:00
Bill Yi
9f2ffbcd66 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 9aed8c2fa0  -s ours

* commit '9aed8c2fa01785be20cd7cc07976670812bc84a0':
  Import translations. DO NOT MERGE

Change-Id: Ia3070d2cf441bdcd63f39ff90b8c77da1c37fc16
 2016-05-26 17:52:53 +00:00
Tenghui Zhu
e78ba24c17 Merge "Update the light center when the root view's layout changed" into nyc-dev 2016-05-26 17:48:49 +00:00
Phil Burk
d34d06606d Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev 2016-05-26 17:46:08 +00:00
Bill Yi
8272bb6af4 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb8c569414  -s ours

* commit 'cb8c569414121158adb2a627d4a91b47dd3c4362':
  Import translations. DO NOT MERGE

Change-Id: I200d13ae1563e54f4c93413395e4f5d8823f7fcc
 2016-05-26 17:37:41 +00:00
Julia Reynolds
901bdeadef Merge "Importance slider updates." into nyc-dev 
am: 2bf73e94c3

* commit '2bf73e94c389bf9457df132d6eaf294f9d35587f':
  Importance slider updates.

Change-Id: I26df0b8c0aa02cba63b485b85845cfc631416cd8
 2016-05-26 17:36:52 +00:00
Jeff Sharkey
6843da1aa8 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I0e4ae30da7c40cf4712147c65bfb0fbec5f84b95
 2016-05-26 17:35:16 +00:00
Jason Monk
b59383a375 Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev 
am: 72f19ff6f0

* commit '72f19ff6f057fff184c875194e802005f8e8fd08':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: I3dfc510ddcad9e446806a235fa96bbf975ede4b8
 2016-05-26 17:34:53 +00:00
Phil Burk
2050f6cb43 AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY 
Explain buffer size optimization.

This CL has no code changes, just documentation changes.

Bug: 28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
 2016-05-26 10:34:50 -07:00
Manoja Wijewardene
1ad12e0678 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev 2016-05-26 17:20:49 +00:00
TreeHugger Robot
9aed8c2fa0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:55 +00:00
TreeHugger Robot
cb8c569414 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 16:56:13 +00:00
Robin Lee
174385a208 Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev 
am: 33154deb70

* commit '33154deb700a8cf5df6fff39f0b3291d1278efa0':
  Check if we're connected before marking a UID blocked

Change-Id: I59468eda566dca96faafe328f19bd94d67b16d9d
 2016-05-26 16:54:34 +00:00
Chris Wren
32b50d9c39 Merge "add metrics for notification and group expansion" into nyc-dev 
am: 0f97b8fcbd

* commit '0f97b8fcbddbbd40f5cf45ba57a5d9db48a611a0':
  add metrics for notification and group expansion

Change-Id: I32d730fcc03da49217d9c4ba2a27f41e15eca73f
 2016-05-26 16:54:27 +00:00
Chris Wren
9f7067bb80 Merge "boost starred people to at least high importance" into nyc-dev 
am: 8e5d7413b8

* commit '8e5d7413b85a7b202bc917eee4287762b13b864b':
  boost starred people to at least high importance

Change-Id: I2cf177c7be3693d05132c8fdd75d5387854a8b88
 2016-05-26 16:54:20 +00:00
Julia Reynolds
2bf73e94c3 Merge "Importance slider updates." into nyc-dev 2016-05-26 16:50:58 +00:00
TreeHugger Robot
36cbf5ca37 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 2016-05-26 16:49:51 +00:00
Jason Monk
72f19ff6f0 Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev 2016-05-26 16:46:48 +00:00
Robin Lee
33154deb70 Merge "Check if we're connected before marking a UID blocked" into nyc-dev 2016-05-26 16:42:17 +00:00
TreeHugger Robot
0f97b8fcbd Merge "add metrics for notification and group expansion" into nyc-dev 2016-05-26 16:35:29 +00:00
TreeHugger Robot
8e5d7413b8 Merge "boost starred people to at least high importance" into nyc-dev 2016-05-26 16:35:21 +00:00
Jonathan Basseri
531cd8724c Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
 2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
 2016-05-26 15:54:38 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Jeff Sharkey
4815ed4500 Cache IMountService for isUserKeyUnlocked() calls. 
This avoids doing a ServiceManager lookup for every call through
this hot code-path.

Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
 2016-05-26 09:31:06 -06:00
Robin Lee
ebbcb54a43 Check if we're connected before marking a UID blocked 
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.

Only affects always-on VPN when lockdown=true.

Bug: 28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
 2016-05-26 15:29:46 +00:00
Julia Reynolds
3aa969f68d Importance slider updates. 
Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
 2016-05-26 11:07:49 -04:00
Jason Monk
49a2796cdd QS: Make hotspot go unavailable in airplane mode 
Put the hotspot tile in the unavailable state whenever airplane
mode is on.

Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes: 28881032
 2016-05-26 10:57:59 -04:00
Michael Wright
4f6ae7bbaa Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
 2016-05-26 14:39:03 +00:00
Ricky Wai
754ddca748 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
 2016-05-26 14:03:51 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Ricky Wai
7c46f928f4 Merge "Store work lock type even it uses unified lock" into nyc-dev 
am: 610fb8a3f2

* commit '610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
  Store work lock type even it uses unified lock

Change-Id: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275
 2016-05-26 14:02:12 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Ricky Wai
610fb8a3f2 Merge "Store work lock type even it uses unified lock" into nyc-dev 2016-05-26 13:46:12 +00:00
Christopher Tate
0905c8f398 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 
am: 040cf14047

* commit '040cf14047fb025f603c73e56a9bfd06c84a2483':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f
 2016-05-26 12:52:19 +00:00
Christopher Tate
040cf14047 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 
am: 1fa817c057

* commit '1fa817c057c909d1ba4f5a356f6eb4b52a3bc628':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f
 2016-05-26 12:31:55 +00:00
Nicolas Prevot
37b0156d21 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 
am: 19d34821b9

* commit '19d34821b9c0a74d4269fff0bee87a7f486e1603':
  Use correct user id when checking uri grants for notification.

Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1
 2016-05-26 11:06:30 +00:00
Nicolas Prévot
19d34821b9 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 2016-05-26 10:37:32 +00:00
Yi Kong
5ede03bfd5 Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
  Docs: Update content license page to include Javadocs licenses

Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577
 2016-05-26 09:09:08 +00:00
Yi Kong
03a1314f2e Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 2016-05-26 08:54:57 +00:00
Bill Yi
05930a0c1f Import translations. DO NOT MERGE 
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
 2016-05-26 00:41:49 -07:00
Lajos Molnar
e3d6b69562 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
 2016-05-26 06:27:34 +00:00
Lajos Molnar
40585321d7 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 2016-05-26 06:14:04 +00:00
Dirk Dougherty
970446d0ac Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb 
am: a283dabdf5

* commit 'a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
  Remove spurious url reference.

Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6
 2016-05-26 05:53:48 +00:00
Dirk Dougherty
a283dabdf5 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
  Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
 2016-05-26 05:44:29 +00:00