Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
1f37f7aebb Merge "Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp am: 24f6de59e5" 2016-05-26 16:34:51 +00:00
Android Build Merger (Role)
38bbe55e54 Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d am: 54b280ba66" 2016-05-26 16:34:38 +00:00
Ji Yang
7b58fa02ed Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp 
am: 24f6de59e5

* commit '24f6de59e5f7913665baa31a157d54fbe88cdf81':

Change-Id: I83a5f2e1b7cb084fb85b273aa8790106af130ea2
 2016-05-26 16:33:06 +00:00
Ji Yang
811d0411f3 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d 
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777
 2016-05-26 16:31:58 +00:00
Baligh Uddin
c98afe8a4d Merge "Import translations. DO NOT MERGE" 2016-05-26 16:31:18 +00:00
Baligh Uddin
06aa634b0b Merge "Import translations. DO NOT MERGE" 2016-05-26 16:30:36 +00:00
Baligh Uddin
664663568b Merge "Import translations. DO NOT MERGE" 2016-05-26 16:30:25 +00:00
Baligh Uddin
717d3b9c4e Merge "Import translations. DO NOT MERGE" 2016-05-26 16:30:15 +00:00
TreeHugger Robot
ca6d2c69dc Merge "Consolidate cleanup logic in TetherInterfaceSM.TetheredState" 2016-05-26 16:21:38 +00:00
Android Build Merger (Role)
24f6de59e5 Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp 2016-05-26 16:15:29 +00:00
Ji Yang
f92d712e6f Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff 
am: f8969b233c

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

Change-Id: I770c85c4036de650f78bb0bdb57ea610049e9511
 2016-05-26 16:12:57 +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
54b280ba66 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff 
am: e6c6ca417d

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

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
 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
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

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

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
 2016-05-26 15:54:27 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Jeff Sharkey
4a39936d36 Suppress unlock notifications on non-FBE devices. 
We have a longer-term plan to clean up FBE unlock notifications, but
in the meantime don't confuse users by quickly flashing them on
non-FBE devices.

Bug: 28840764
Change-Id: I696508ef981b6f8f51f22ea24487d87d27d5b6e3
 2016-05-26 09:47:45 -06: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
Michael Wright
3bc7036b5c Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e am: 28984d4d80 
am: fdaea8d403  -s ours

* commit 'fdaea8d4033bc5400070df7d8f9b76d4784cefd1':

Change-Id: I527570fa27451c0e887c36332aecd18ff8409dad
 2016-05-26 15:24:15 +00:00
Michael Wright
dece0bc050 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e am: 4f6ae7bbaa 
am: 5944e07e99  -s ours

* commit '5944e07e99eabd79abc80a1ce3dc3cbc3e3e4b68':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I79c02a60092b1d38a99e905b6d84a2f7b34e20ad
 2016-05-26 15:23:53 +00:00
Paul Jensen
94c8855da6 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 
am: 7ff57eaff9

* commit '7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I80187f003e437678786f0740f23e76543890b9bc
 2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb 
am: a5a2c88fb3

* commit 'a5a2c88fb3ac43315575de94696c837cb6b88c35':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
 2016-05-26 15:13:07 +00:00
Julia Reynolds
3aa969f68d Importance slider updates. 
Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
 2016-05-26 11:07:49 -04:00
Michael Wright
fdaea8d403 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e 
am: 28984d4d80

* commit '28984d4d80affa52324f4c17caae30c6bc3bc3ab':

Change-Id: I4cd9b6ffa87be709845c7531cacac10978664f4e
 2016-05-26 15:02:50 +00:00
Paul Jensen
a5a2c88fb3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 
am: 54a62d5feb

* commit '54a62d5febc8771f65221db3dd5c6e08f3288eb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
 2016-05-26 15:02:46 +00: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
Ricky Wai
b2ab07aead Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 9b22e5b4e8" into nyc-mr1-dev-plus-aosp 
am: 0b0a6dd96e

* commit '0b0a6dd96e015888e63bafb054ed48faee190688':

Change-Id: I83a2a3e239dfb3eb2eba1c949926af98bb8e0419
 2016-05-26 14:52:08 +00:00
Michael Wright
5944e07e99 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e 
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679
 2016-05-26 14:51:30 +00:00
Ricky Wai
f7a58e292c Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp 
am: 1db5fc9810

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

Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923
 2016-05-26 14:51:20 +00:00
Ricky Wai
269c138bc5 Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 56181175a7" into nyc-mr1-dev-plus-aosp 
am: 26bbadc484

* commit '26bbadc484f094a9e89f59ad946d74d4b4f8aa82':

Change-Id: Id06de5146cc22a6ac86f00c734f4131b16d345c7
 2016-05-26 14:50:54 +00:00
Ricky Wai
5b7a72d88f Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 7c46f928f4 
am: 4f680d9c78

* commit '4f680d9c78aff68b0d7ebd92b19b5d9e7ee2467f':
  Store work lock type even it uses unified lock

Change-Id: I63f04e54fee21cb530215f4af6379cd12c290404
 2016-05-26 14:50:42 +00:00
Paul Jensen
54a62d5feb Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 
am: 7c625e1938

* commit '7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
  Don't pass URL path and username/password to PAC scripts

Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
 2016-05-26 14:50:37 +00: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
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

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

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
 2016-05-26 14:38:56 +00:00
Android Build Merger (Role)
0b0a6dd96e Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 9b22e5b4e8" into nyc-mr1-dev-plus-aosp 2016-05-26 14:37:25 +00:00
Android Build Merger (Role)
1db5fc9810 Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp 2016-05-26 14:37:14 +00:00
Android Build Merger (Role)
26bbadc484 Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 56181175a7" into nyc-mr1-dev-plus-aosp 2016-05-26 14:37:08 +00:00
Ricky Wai
e30838fc76 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 
am: 9b22e5b4e8

* commit '9b22e5b4e80e9daadf2af6430607016839e1909c':
  Add resetKeyStore() in LockSettingsService

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

* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
  Add resetKeyStore() in LockSettingsService

Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
 2016-05-26 14:35:30 +00:00
Paul Jensen
7c625e1938 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 
am: 75095e6f02

* commit '75095e6f02b13d070bb74b019ab6392f0f7b1105':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e
 2016-05-26 14:35:08 +00:00
Ricky Wai
57718ea6f7 Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 
am: 56181175a7

* commit '56181175a7717dc1d8ea58cdd2ecdcb252119304':
  Store work lock type even it uses unified lock

Change-Id: I0e2c41d37e25c463c60de8d8f6196b2612550b06
 2016-05-26 14:34:30 +00:00
Ricky Wai
4f680d9c78 Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 
am: 7c46f928f4

* commit '7c46f928f4ef3998f16084cb5eeb732c0d2b21e7':
  Store work lock type even it uses unified lock

Change-Id: I944565b7120f1bb6440a9f0a51831b326564ce05
 2016-05-26 14:34:01 +00:00
Paul Jensen
75095e6f02 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 
am: 42a5983364

* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
 2016-05-26 14:13:16 +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
Ricky Wai
9b22e5b4e8 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 
am: 1cb6f9d8a4

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

Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
 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
56181175a7 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: I89e322d1f21964074a3deec2fcc9a507c496d36e
 2016-05-26 14:02:06 +00:00