Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,353 Commits 3 Branches 0 Tags
c607d1db22c95d2f09ca2ec45320f1ba52ea33ca
Commit Graph

61176 Commits

Author SHA1 Message Date
Antonio Cansado
c607d1db22 Merge "Implementation of data usage callbacks." into nyc-dev am: 12d7ea815b 
am: 7e098af672

* commit '7e098af67280dbc877790486043998b13e83986e':
  Implementation of data usage callbacks.
 2016-02-18 21:12:15 +00:00
Antonio Cansado
7e098af672 Merge "Implementation of data usage callbacks." into nyc-dev 
am: 12d7ea815b

* commit '12d7ea815b772b1013f9f5a583d296701a702a0c':
  Implementation of data usage callbacks.
 2016-02-18 20:53:58 +00:00
Jeff Sharkey
3825dcd754 Merge "Make BackupManager encryption aware." into nyc-dev 
am: 003ee19851

* commit '003ee198518490c9572e610ddc21e8b3a024364c':
  Make BackupManager encryption aware.
 2016-02-18 20:52:48 +00:00
Doris Liu
117a29cae7 Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev am: 5b7188aebc 
am: e98f28aad1

* commit 'e98f28aad1b1392cb2673b829c64b445e35f3737':
  Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""
 2016-02-18 19:48:14 +00:00
Doris Liu
e4ab16ec5b Merge "Revert "Check RenderNode\'s owning view before attaching animators"" into nyc-dev am: b9fb8fdf78 
am: c5c59024d1

* commit 'c5c59024d1b79fe365fbdbddd5bf80137a6fadcc':
  Revert "Check RenderNode's owning view before attaching animators"
 2016-02-18 19:47:01 +00:00
Antonio Cansado
12d7ea815b Merge "Implementation of data usage callbacks." into nyc-dev 2016-02-18 19:43:42 +00:00
Jeff Sharkey
003ee19851 Merge "Make BackupManager encryption aware." into nyc-dev 2016-02-18 19:26:36 +00:00
Erik Kline
941a0d8584 Add Protocol.BASE_ETHERNET am: ca4c61aa9f am: bc163f07ee 
am: 060838dcfc

* commit '060838dcfc69f92dbc8f836ee641dcf9d02fd122':
  Add Protocol.BASE_ETHERNET
 2016-02-18 19:26:09 +00:00
Doris Liu
e98f28aad1 Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev 
am: 5b7188aebc

* commit '5b7188aebc2401c9c010543eff62ef53036c147b':
  Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""
 2016-02-18 19:23:23 +00:00
Doris Liu
c5c59024d1 Merge "Revert "Check RenderNode\'s owning view before attaching animators"" into nyc-dev 
am: b9fb8fdf78

* commit 'b9fb8fdf78ba3369da1fc89932bb8253b9183620':
  Revert "Check RenderNode's owning view before attaching animators"
 2016-02-18 19:20:26 +00:00
Vladislav Kaznacheev
e7fc3fc93b Merge "Do not call IWindowSession.updatePointer icon from pointer handler" into nyc-dev am: 7549a9a8f2 
am: ea2ff3ca41

* commit 'ea2ff3ca417712b715179377386f41de26a593c2':
  Do not call IWindowSession.updatePointer icon from pointer handler
 2016-02-18 19:15:33 +00:00
Doris Liu
5b7188aebc Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev 2016-02-18 19:06:20 +00:00
Doris Liu
b9fb8fdf78 Merge "Revert "Check RenderNode's owning view before attaching animators"" into nyc-dev 2016-02-18 19:04:28 +00:00
Julia Reynolds
487295103d Merge "Inflate and strip remote views for pre-N apps." into nyc-dev am: 4bb2de2557 
am: 3c2ed58ff0

* commit '3c2ed58ff01b5443c6d29f5bf873a28062fe0715':
  Inflate and strip remote views for pre-N apps.
 2016-02-18 19:00:55 +00:00
Erik Kline
060838dcfc Add Protocol.BASE_ETHERNET am: ca4c61aa9f 
am: bc163f07ee

* commit 'bc163f07ee77b6f2b6cee02156935eab476b19a8':
  Add Protocol.BASE_ETHERNET
 2016-02-18 19:00:00 +00:00
Vladislav Kaznacheev
ea2ff3ca41 Merge "Do not call IWindowSession.updatePointer icon from pointer handler" into nyc-dev 
am: 7549a9a8f2

* commit '7549a9a8f2934635ccc58161ebc526c994d7ab58':
  Do not call IWindowSession.updatePointer icon from pointer handler
 2016-02-18 18:54:15 +00:00
Sudheer Shanka
47dafc978a Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev am: af9c30aa74 
am: 19e2adac15

* commit '19e2adac15d36e7307c275e253ae998536e539a6':
  Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden.
 2016-02-18 18:54:06 +00:00
Shawn Willden
291c7ddc33 Merge "Add support for extending key validity while on body." into nyc-dev am: 0f900c02d9 
am: b838736b6e

* commit 'b838736b6eea75bb652b2bd7724979074c37d502':
  Add support for extending key validity while on body.
 2016-02-18 18:45:34 +00:00
Julia Reynolds
3c2ed58ff0 Merge "Inflate and strip remote views for pre-N apps." into nyc-dev 
am: 4bb2de2557

* commit '4bb2de255733d48cbb21587fa4ab0eb4eacee943':
  Inflate and strip remote views for pre-N apps.
 2016-02-18 18:40:09 +00:00
Doris Liu
df7fdb1e0b Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" 
This reverts commit 0d20a275a5.

Change-Id: I97c782f1164a5d39ab74dc098cca71d9e1b30cd8
 2016-02-18 18:37:02 +00:00
Doris Liu
eb40178af3 Revert "Check RenderNode's owning view before attaching animators" 
This reverts commit 12abdeb3c7.

Change-Id: I938deddf5f294127f87a0e70f940fe5b9a85e0b2
 2016-02-18 18:34:59 +00:00
Sudheer Shanka
19e2adac15 Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev 
am: af9c30aa74

* commit 'af9c30aa741b0b385840ffcd60040d8524b95f89':
  Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden.
 2016-02-18 18:34:39 +00:00
Shawn Willden
b838736b6e Merge "Add support for extending key validity while on body." into nyc-dev 
am: 0f900c02d9

* commit '0f900c02d9aafa9a98ff39ea7d661c1cdfbddcdb':
  Add support for extending key validity while on body.
 2016-02-18 18:30:59 +00:00
Erik Kline
bc163f07ee Add Protocol.BASE_ETHERNET 
am: ca4c61aa9f

* commit 'ca4c61aa9f7396a167202ea83f4d02f7f62ba482':
  Add Protocol.BASE_ETHERNET
 2016-02-18 18:19:06 +00:00
Jeff Sharkey
2c1ba9a961 Make BackupManager encryption aware. 
Backup requires both CE and DE storage to be available, so delay
spinning up the backup system until the user is unlocked, since
that's when CE storage becomes available.  Note that devices without
FBE immediately transition USER_SYSTEM into the unlocked state,
since their CE is always available.

Offer to backup and restore files under both CE and DE.  Since DE
is effectively the same as CE, most logic is simply duplicated for
now, but it could be simplified in the future.  Since system apps
can force their default storage location to DE, we always build
explicit CE and DE paths.

Add getDataDir() to give clean access to the top-level private data
directory, but disclaim that apps shouldn't create files there.

Bug: 26279618
Change-Id: Ic34a4b330223725db93b1d0f5c9dffc88002c61f
 2016-02-18 10:54:11 -07:00
Vladislav Kaznacheev
7549a9a8f2 Merge "Do not call IWindowSession.updatePointer icon from pointer handler" into nyc-dev 2016-02-18 17:43:39 +00:00
Jeff Sharkey
7368938550 Merge "Make BackupManager encryption aware." 2016-02-18 17:38:42 +00:00
Julia Reynolds
4bb2de2557 Merge "Inflate and strip remote views for pre-N apps." into nyc-dev 2016-02-18 15:18:11 +00:00
Sudheer Shanka
af9c30aa74 Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev 2016-02-18 13:58:05 +00:00
Julia Reynolds
d4ea741d66 Inflate and strip remote views for pre-N apps. 
Bug: 27120291
Change-Id: I4e1497222f3787e68c3e385e45ab6a7c23799917
 2016-02-18 08:35:45 -05:00
Shawn Willden
0f900c02d9 Merge "Add support for extending key validity while on body." into nyc-dev 2016-02-18 12:51:50 +00:00
Shawn Willden
adef49640d Add support for extending key validity while on body. 
Bug: 21563854
Change-Id: I3b622d2af77ec4ac3ba42407fc391112c153ef0f
 2016-02-18 05:50:21 -07:00
Sudheer Shanka
aebd5dd786 Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden. 
Bug: 27225657
Change-Id: I85ad8bf88845e9164011b303ec9ca90d993fc20e
 2016-02-18 12:39:57 +00:00
Yohei Yukawa
a715dcfa3d Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev am: 218c2ab00a 
am: 96196358a5

* commit '96196358a50ca2cb8b7c4267a69a802f42b70ff8':
  Fix bugs in logic to find a default selectd IME.
 2016-02-18 09:39:07 +00:00
Yohei Yukawa
96196358a5 Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev 
am: 218c2ab00a

* commit '218c2ab00ae1597e2728d8b2c865269717150dd3':
  Fix bugs in logic to find a default selectd IME.
 2016-02-18 09:34:21 +00:00
Yohei Yukawa
218c2ab00a Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev 2016-02-18 09:30:45 +00:00
Erik Kline
ca4c61aa9f Add Protocol.BASE_ETHERNET 
Change-Id: I4e51370c0b53d9902eea8aae409f9f7cffaf28ad
 2016-02-18 18:15:52 +09:00
Yohei Yukawa
c2393ac3bf Fix bugs in logic to find a default selectd IME. 
With this CL, InputMethodManagerService#resetDefaultImeLocked()
picks up the default selected IME with the same logic to find the
default enabled IMEs [1].  It should make sense because the default
selected IME should be one of the default enabled IMEs.  The previous
code is problematic because it does not check whether the IME is enabled
or not.  There was a chance that unusable IME could be picked up.

This CL also fixes the same problem to Bug 17347871 that only language
part of the locale is taken into account.

  [1] See the following series of CLs.
    - part 1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
              ed20f8d750ef0b6347448265a14ef2a2c7e1af5c
    - part 2: Ife93d909fb8a24471c425c903e2b7048826e17a3
              745e7bca8a622ffdf0d0a8e8e2485eab98182ede
    - part 3: I6571d464a46453934f0a8f5e79018a67a9a3c845
              d0dbd81fe2cd34c9a83e2f5217374d3e1a79f950
    - part 4: I871ccda787eb0f1099ba3574356c1da4b33681f3
              b21220efae

Bug: 27197621
Change-Id: Ia0f52c1fb9f5a68230284a1ec4829a2337b60bdd
 2016-02-18 00:30:45 -08:00
Erik Kline
abef123606 {,Base}DhcpStateMachine is no more am: efa4209fe0 am: 7651b21fe9 
am: 9a927da7cf

* commit '9a927da7cfd565ee21f5929f2195f9295f81f160':
  {,Base}DhcpStateMachine is no more
 2016-02-18 04:46:40 +00:00
Erik Kline
9a927da7cf {,Base}DhcpStateMachine is no more am: efa4209fe0 
am: 7651b21fe9

* commit '7651b21fe94dc081276a7bbff72f8c37a70f1b94':
  {,Base}DhcpStateMachine is no more
 2016-02-18 04:42:58 +00:00
Erik Kline
7651b21fe9 {,Base}DhcpStateMachine is no more 
am: efa4209fe0

* commit 'efa4209fe022d007f48edc3c4feaef00a9865cb5':
  {,Base}DhcpStateMachine is no more
 2016-02-18 04:38:38 +00:00
Erik Kline
efa4209fe0 {,Base}DhcpStateMachine is no more 
Bug: 26991160
Change-Id: I21f8c30627bf2a7fbcd5b4d5f1f1ad1a2dda759b
 2016-02-18 12:56:45 +09:00
Deepanshu Gupta
c10b7493b6 Merge "LayoutLib fixes for N" into nyc-dev am: f0c5b7af6f 
am: 89237f4b7f

* commit '89237f4b7fcde0dd45a7734df8a742e3a94b8cb9':
  LayoutLib fixes for N
 2016-02-18 03:33:59 +00:00
Deepanshu Gupta
89237f4b7f Merge "LayoutLib fixes for N" into nyc-dev 
am: f0c5b7af6f

* commit 'f0c5b7af6f062e6e064af22ee58e9eb6b549a6ce':
  LayoutLib fixes for N
 2016-02-18 03:28:35 +00:00
Antonio Cansado
cd42acd951 Implementation of data usage callbacks. 
NetworkStatsService will register data usage requests
and keep data usage stats scoped to the request.

There are different types of data usage requests
- scoped to a set of NetworkTemplate; these are restrictred to
device owners and carrier apps and allow the caller to monitor
all activity on the specified interfaces.
- scoped to all uids visible to the user, if the user has
android.Manifest.permission#PACKAGE_USAGE_STATS permission.
The set of uids may change over time, so we keep track of that.
- scoped to a set of uids given by the caller, granted that
the caller has access to those uids.
- scoped to the caller's own data usage. This doesn't require
PACKAGE_USAGE_STATS.

Bug: 25812785
Change-Id: Ie11f35fc1f29d0dbe82f7fc924b169bb55c76708
 2016-02-17 18:43:53 -08:00
Alex Klyubin
c65ea747f7 Merge "Use production ID for v2 signing scheme." into nyc-dev am: be8c223c24 
am: 74d5138dc2

* commit '74d5138dc2b097fbcde753fc79434d5b0bb9744e':
  Use production ID for v2 signing scheme.
 2016-02-18 02:11:44 +00:00
Deepanshu Gupta
491523d52c LayoutLib fixes for N 
Moves LayoutLib to Java 8 - YAY!
Fix delegates

Change-Id: I098996e43e330e995d33f12df1c16355bbc02f0f
 2016-02-18 02:10:24 +00:00
Alex Klyubin
74d5138dc2 Merge "Use production ID for v2 signing scheme." into nyc-dev 
am: be8c223c24

* commit 'be8c223c2459be17f7ee8a5f078b11a34fd1b7ca':
  Use production ID for v2 signing scheme.
 2016-02-18 02:07:59 +00:00
Alex Klyubin
be8c223c24 Merge "Use production ID for v2 signing scheme." into nyc-dev 2016-02-18 02:03:48 +00:00
Vladislav Kaznacheev
527905e195 Do not call IWindowSession.updatePointer icon from pointer handler 
Currently if View.setPointerIcon is called from inside a pointer
event handler this will cause a redundant round-trip to the server
which can be easily avoided.

Bug: 27107871
Change-Id: Ia641818c3700c0d96d0c32e020b91af58dccfa2a
 2016-02-17 16:51:05 -08:00