Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,141 Commits 3 Branches 0 Tags
68d91c0a81da035032326729647fee230fc96320
Commit Graph

63584 Commits

Author SHA1 Message Date
Robin Lee
68d91c0a81 Merge "API to approve CA certificates" into nyc-dev am: f1fe782 
am: 8d0373c

* commit '8d0373c8fdeabbe90df4d78652cf03c8f9d0fd9f':
  API to approve CA certificates

Change-Id: I86bf99827083c57bde7b14704e942d19ecc94b87
 2016-03-31 18:34:38 +00:00
John Reck
8fdf729fb7 Merge "Add a callback for rendernode parentcount=0" into nyc-dev am: bbb4c2e 
am: 3c77e5a

* commit '3c77e5aa9d219193ba8a8e5f33ad23e63f55d4f5':
  Add a callback for rendernode parentcount=0

Change-Id: Ia49e05a9235d16249553b8638f9a2dad894f2198
 2016-03-31 18:34:35 +00:00
Robin Lee
8d0373c8fd Merge "API to approve CA certificates" into nyc-dev 
am: f1fe782

* commit 'f1fe782e912d3feed9cded8fb80b179c4ee5d09c':
  API to approve CA certificates

Change-Id: Ia84876f692a79d159cbfadd5888d73557e111e37
 2016-03-31 18:31:32 +00:00
John Reck
3c77e5aa9d Merge "Add a callback for rendernode parentcount=0" into nyc-dev 
am: bbb4c2e

* commit 'bbb4c2eb2e871977289a9c48f414962e46b56ddc':
  Add a callback for rendernode parentcount=0

Change-Id: I8168b028ce61413da8ecea76e6531c5dde9ddb46
 2016-03-31 18:31:30 +00:00
Robin Lee
f1fe782e91 Merge "API to approve CA certificates" into nyc-dev 2016-03-31 18:26:32 +00:00
John Reck
bbb4c2eb2e Merge "Add a callback for rendernode parentcount=0" into nyc-dev 2016-03-31 18:24:49 +00:00
Ruben Brunk
b839b91fde Merge "Include VR throttling limit in hardware properties." into nyc-dev am: ee1062e 
am: f5d1bc3

* commit 'f5d1bc31fe66881bbf81c54e0a8d24699bfc54ea':
  Include VR throttling limit in hardware properties.

Change-Id: I7861d381c5fec4eab38d78ec24eb80e44bb21e55
 2016-03-31 18:14:18 +00:00
Ruben Brunk
f5d1bc31fe Merge "Include VR throttling limit in hardware properties." into nyc-dev 
am: ee1062e

* commit 'ee1062e4c011578906edf08d340eff5a55ebe085':
  Include VR throttling limit in hardware properties.

Change-Id: I5d404f5fe7ad36dfe5269f7acb148146b7c2eabf
 2016-03-31 18:11:08 +00:00
Ruben Brunk
ee1062e4c0 Merge "Include VR throttling limit in hardware properties." into nyc-dev 2016-03-31 18:03:37 +00:00
Joe Onorato
f518af881e Merge "Include process state in association tracking" into nyc-dev am: d0f83b7 
am: d1d3cfb1

* commit 'd1d3cfb1b6c150825a350f8354aee53a76506111':
  Include process state in association tracking

Change-Id: I6153f90327964ce67be3010a1026ece4b47d545c
 2016-03-31 17:55:12 +00:00
Sunny Goyal
c93e9f5b8a Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev am: 56d3dd8 
am: 80d57ef

* commit '80d57efd94b7c394a39f78a2425d82aed5c75485':
  Chaning LauncherActivityInfo to return a density specific non-badged icon

Change-Id: Idda2dec39ecb821578ba213b4046e5210a6bfe63
 2016-03-31 17:54:51 +00:00
Joe Onorato
d1d3cfb1b6 Merge "Include process state in association tracking" into nyc-dev 
am: d0f83b7

* commit 'd0f83b7bcadc6cfa4f39ee99ea96e48591fd6539':
  Include process state in association tracking

Change-Id: Ifff023a305ed76b15966ef30812961f528e9b434
 2016-03-31 17:49:18 +00:00
Sunny Goyal
80d57efd94 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 
am: 56d3dd8

* commit '56d3dd8af70f2b24aa7f2cabae025c5fea06a1c8':
  Chaning LauncherActivityInfo to return a density specific non-badged icon

Change-Id: I642e890b23bbd59be6fce6ddee1cb74be6b5f71a
 2016-03-31 17:49:05 +00:00
Joe Onorato
d0f83b7bca Merge "Include process state in association tracking" into nyc-dev 2016-03-31 17:09:24 +00:00
Robin Lee
2f7e1e487c API to approve CA certificates 
Bug: 18224038
Change-Id: Id928872cd70dac5a5ecfdcd52150fe6dea544e3b
 2016-03-31 18:06:44 +01:00
Sunny Goyal
56d3dd8af7 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 2016-03-31 16:56:31 +00:00
Gustav Sennton
1d4c0dbbf3 Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev am: ef40c9a 
am: 505d64c

* commit '505d64c23a2812603f8545840efcf47f3538e5e1':
  Simplify WebViewProviderInfo - move its logic into WebViewUpdateService.

Change-Id: Iddf01ee95b30282f11912c41e74cd11b89eea025
 2016-03-31 15:41:02 +00:00
Andrei Stingaceanu
51bc9d8e30 Merge "AfW - suspend apps - API polish" into nyc-dev am: aa60469 
am: 4c0fc48

* commit '4c0fc48aa739cb7b908ac48eb7a500abe487fdbd':
  AfW - suspend apps - API polish

Change-Id: I5b244f14d7ceaec9654f10dcdf33a3ab9d7656bc
 2016-03-31 15:40:28 +00:00
Gustav Sennton
505d64c23a Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev 
am: ef40c9a

* commit 'ef40c9acd558a38ae5ea69214c78dd36ef713d77':
  Simplify WebViewProviderInfo - move its logic into WebViewUpdateService.

Change-Id: I7e80475f9c1dd279f435efabaad0673359260d26
 2016-03-31 15:37:28 +00:00
Andrei Stingaceanu
4c0fc48aa7 Merge "AfW - suspend apps - API polish" into nyc-dev 
am: aa60469

* commit 'aa604694450539b4c99901b0714efaa79db3c87d':
  AfW - suspend apps - API polish

Change-Id: I0bbb5d6ddc8f81d70960d179cf5f37f913ccddd8
 2016-03-31 15:36:58 +00:00
John Reck
44b49f070a Add a callback for rendernode parentcount=0 
Bug: 27709981
Fixes: 22565656

Change-Id: I1cb4461baf9069dc4e7ca6de10d5862578c107f4
 2016-03-31 08:36:50 -07:00
Gustav Sennton
ef40c9acd5 Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev 2016-03-31 15:28:53 +00:00
Gustav Sennton
dbf5eb04e6 Simplify WebViewProviderInfo - move its logic into WebViewUpdateService. 
The WebViewProviderInfo should now be ready to be added as an API to be
fetched from XTS tests (to avoid using reflection).

Move the logic for validation, signature checking and package info
fetching out of WebViewProviderInfo so that we can mock the coupling
between that logic and the system (e.g. the package manager).

Note: with this patch we stop caching valid webview packages in the
update service (we would still refetch them anyway when anything
important happened).

Bug: 27635535
Bug: 27736084

Change-Id: Ia455202d2fd5bc4e03dce0fd917d262bf942d1a3
 2016-03-31 14:21:47 +01:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Michal Karpinski
f418f53ca6 Merge "Adjusting javadocs for process logging" into nyc-dev am: 31f59f1 
am: 2d884a2

* commit '2d884a207b4dfc46f37acde4765cca987369474f':
  Adjusting javadocs for process logging

Change-Id: Ifa3d018c8eb7a1c0e8012998a98bd4852b33a382
 2016-03-31 10:05:40 +00:00
Michal Karpinski
2d884a207b Merge "Adjusting javadocs for process logging" into nyc-dev 
am: 31f59f1

* commit '31f59f1106824594ab8d5d48391b785b8687c4b0':
  Adjusting javadocs for process logging

Change-Id: Ia37bd42b2f7dffd71d08515a5d8b93771effbf57
 2016-03-31 10:02:57 +00:00
Michal Karpinski
31f59f1106 Merge "Adjusting javadocs for process logging" into nyc-dev 2016-03-31 09:56:24 +00:00
Jeff Sharkey
562ac8b9bb Merge changes Ifecff4f1,Ia302de46 into nyc-dev am: 2c0ae91 
am: 4d5806d

* commit '4d5806d0e662e0163ad174f61779a4d4ddf48b81':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I7aa9858905cc241343da5a1fb3479bf3f74b8ba8
 2016-03-31 07:00:10 +00:00
Jeff Sharkey
4d5806d0e6 Merge changes Ifecff4f1,Ia302de46 into nyc-dev 
am: 2c0ae91

* commit '2c0ae91f2d22b2c9a3b506d3a7f60bc31f72c57d':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I24829b73653a657a210e41fed6f199f4b8e4dac9
 2016-03-31 06:57:16 +00:00
Jeff Sharkey
2c0ae91f2d Merge changes Ifecff4f1,Ia302de46 into nyc-dev 
* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.
 2016-03-31 06:48:55 +00:00
Jeff Sharkey
70168dde6e Make Parcelable classes final, API cleanup. 
Remove some Context methods that leaked through.  Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].

Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
 2016-03-30 23:31:39 -06:00
Philip P. Moltmann
b1a9edf3ca Merge "Parse and validate txt records." into nyc-dev am: c1ed9eb 
am: 343e1d8

* commit '343e1d8aafb8adebf2796d748a02c3195510585c':
  Parse and validate txt records.

Change-Id: I1e5d56cc37aacc9cc8f31640def37d8e7a09a652
 2016-03-31 03:58:32 +00:00
Tomasz Mikolajewski
ac0bbdbf27 Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev am: 88f8675 
am: 1372e9b

* commit '1372e9bd9a8cf3a75dd533a620177c5f01a0856f':
  Unhide DocumentsContract.EXTRA_ORIENTATION.

Change-Id: I244dfefa63a02f7710dbd4ec51866e8fd56a687e
 2016-03-31 03:58:30 +00:00
Philip P. Moltmann
343e1d8aaf Merge "Parse and validate txt records." into nyc-dev 
am: c1ed9eb

* commit 'c1ed9ebec7e0148cee2b4fda5ee8019ffe987c96':
  Parse and validate txt records.

Change-Id: Ibe162d646a955359670341d992a52793ebd2cd3f
 2016-03-31 03:55:30 +00:00
Tomasz Mikolajewski
1372e9bd9a Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev 
am: 88f8675

* commit '88f8675471df616b4c302d4b294b711d63179e2d':
  Unhide DocumentsContract.EXTRA_ORIENTATION.

Change-Id: I3464c298fcd770095146a2a16f9f2bcf44cbfcc3
 2016-03-31 03:55:27 +00:00
Jeff Sharkey
e78e7ff560 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev am: 4afe32d 
am: baa9a1a

* commit 'baa9a1a5d5253f952c79a9c215db14244afe2622':
  Keep COLUMN_LOCAL_URI working for now.

Change-Id: I4247f2fe6535435b0425bb7c265fbb9b0040d50b
 2016-03-31 03:53:11 +00:00
Philip P. Moltmann
c1ed9ebec7 Merge "Parse and validate txt records." into nyc-dev 2016-03-31 03:52:50 +00:00
Jeff Sharkey
baa9a1a5d5 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 
am: 4afe32d

* commit '4afe32d4934cc89371dce05d669e9b1bdbf14449':
  Keep COLUMN_LOCAL_URI working for now.

Change-Id: I6d89ede091d3bc6b1620abd2638d28273be5feed
 2016-03-31 03:50:25 +00:00
Tomasz Mikolajewski
88f8675471 Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev 2016-03-31 03:50:19 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00:00
Philip P. Moltmann
312c61edab Parse and validate txt records. 
Bug: 27696905
Change-Id: I9affcf02a51c92a2be1c2bfc5efbd09065e100bc
 2016-03-30 20:33:31 -07:00
Adam Lesinski
ba9f9d9458 Merge "BatteryStats: Add ble scans to checkin data and start global ble scan timer" into nyc-dev am: ac4dfec1 
am: ed72f0e

* commit 'ed72f0e9ba9a9261cb70d77e6172a582923f31d7':
  BatteryStats: Add ble scans to checkin data and start global ble scan timer

Change-Id: I9e0172d22ada763e3a7b5337cb72454121387b66
 2016-03-31 03:06:10 +00:00
Adam Lesinski
ed72f0e9ba Merge "BatteryStats: Add ble scans to checkin data and start global ble scan timer" into nyc-dev 
am: ac4dfec1

* commit 'ac4dfec1c6d684b7d0d8ce09a5cba8fa9003e3a4':
  BatteryStats: Add ble scans to checkin data and start global ble scan timer

Change-Id: I70c38df715190c58809732d03835286ab18a2e27
 2016-03-31 03:03:40 +00:00
Adam Lesinski
ac4dfec1c6 Merge "BatteryStats: Add ble scans to checkin data and start global ble scan timer" into nyc-dev 2016-03-31 02:58:26 +00:00
Amith Yamasani
383eb0256e Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev am: 27c49d5 
am: 54ef247

* commit '54ef24779fee7060c3da52e8973a3e1240ac3d10':
  Fix a deadlock due to wtf in BaseBundle

Change-Id: I739db48b3133ff963a786bb9b00aa8f842883ef8
 2016-03-31 02:32:58 +00:00
Amith Yamasani
54ef24779f Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev 
am: 27c49d5

* commit '27c49d5790647cc0bb81cc76a999ae65fe4a34cc':
  Fix a deadlock due to wtf in BaseBundle

Change-Id: I4049794185b9cc7d29828c13fe8a4441631230f8
 2016-03-31 02:25:26 +00:00
Siyamed Sinir
7b85d32b3a Merge "Reset FontMetrics at each new measurement in BoringLayout" into nyc-dev am: dcb2574 
am: ed507a7

* commit 'ed507a747594257dbef258a329da70860b5f213e':
  Reset FontMetrics at each new measurement in BoringLayout

Change-Id: I79d1c96c029f325e71d42a41a9a8c8f589e77cce
 2016-03-31 02:23:24 +00:00
Vladislav Kaznacheev
595badffaa Merge "Revert "Add wallpaper input consumer to WindowManagerService"" into nyc-dev am: b4142f7 
am: cdaf195

* commit 'cdaf19530e224fc20fd99649cdc7814f1f904778':
  Revert "Add wallpaper input consumer to WindowManagerService"

Change-Id: I25ae1bd1c6c611f820b4d11802aac79e074d83f1
 2016-03-31 02:23:22 +00:00
Philip P. Moltmann
ddea724b36 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0 
am: fa04bc7

* commit 'fa04bc7a5d49415bc7cd397bb9678316d3824f85':
  Add the print service recommendation service

Change-Id: I3da289dfe99e1caa3ed2ab3368902d597f16f738
 2016-03-31 02:23:16 +00:00
Sudheer Shanka
994651ff69 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev am: d2a968f 
am: 81c6380

* commit '81c6380114f30e2ed97ae360c87fd55deb05d8b9':
  Return null value if getActiveAdminUncheckedLocked returns null.

Change-Id: If85a5c57df9619ff6926ec3f2f0ed7727df54b47
 2016-03-31 02:23:05 +00:00