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

63556 Commits

Author SHA1 Message Date
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
Andrii Kulian
e61d037a87 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev am: ac94586 
am: b6ba05f

* commit 'b6ba05ffb07f5785c24de21152405ee0bd92bf3c':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I24d558529fa14f780c714d26a834306057cf7b2b
 2016-03-31 02:22:57 +00:00
Ruchi Kandoi
cb1078ec7d Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev am: 93cfef4 
am: 29e7471

* commit '29e747140ff82b1d48890e9109d669e884eb57fe':
  Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."

Change-Id: I4b042099a0b5f0da7a59556d81075ac55d6c8326
 2016-03-31 02:22:49 +00:00
Mihai Nita
12392f2909 Merge "Ignore stopwords in the Arabic locale sort" into nyc-dev am: aeaa8d6 
am: 1dae8e1

* commit '1dae8e1f0d5e2ff0e0446b852fff891e810dcb51':
  Ignore stopwords in the Arabic locale sort

Change-Id: I60385ac31183bc2392618fea6336386e7f5f58b9
 2016-03-31 02:22:41 +00:00
Felipe Leme
5314b4855c Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev am: d847b51 
am: 25530a0

* commit '25530a0a8bd9baa72cef4b1a739d9632061f6e63':
  Minor tweaks on Scoped Directory Access:

Change-Id: If1d76956f5fbcbc75266496f20efec1ba99513e5
 2016-03-31 02:22:32 +00:00
Vladislav Kaznacheev
f4deb950fd Add wallpaper input consumer to WindowManagerService am: 6013a55 
am: ce230a4

* commit 'ce230a40d24308931e7915b8c5f42fa968f97303':
  Add wallpaper input consumer to WindowManagerService

Change-Id: I9c4c8119f1df29d4683d307043f5c789dd3b3ffb
 2016-03-31 02:22:22 +00:00
Jeff Sharkey
27c49d5790 Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev 2016-03-31 02:18:53 +00:00
Siyamed Sinir
ed507a7475 Merge "Reset FontMetrics at each new measurement in BoringLayout" into nyc-dev 
am: dcb2574

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

Change-Id: Id6d0e1e9a2eece23dd13a83f3a91b86c0599e9ac
 2016-03-31 02:17:33 +00:00
Vladislav Kaznacheev
cdaf19530e Merge "Revert "Add wallpaper input consumer to WindowManagerService"" into nyc-dev 
am: b4142f7

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

Change-Id: I38e9343cca898a7877176de9262e5c9871c427f9
 2016-03-31 02:17:32 +00:00
Philip P. Moltmann
fa04bc7a5d Merge "Add the print service recommendation service" into nyc-dev 
am: 740a5f0

* commit '740a5f023eea7b2fdb3e31efe8b8d5ac18aa8302':
  Add the print service recommendation service

Change-Id: Ie58ade9356f591781496581259b6d8a876780ac9
 2016-03-31 02:17:26 +00:00
Sudheer Shanka
81c6380114 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev 
am: d2a968f

* commit 'd2a968f9c31ba1864bc514bb88a9a939508fe794':
  Return null value if getActiveAdminUncheckedLocked returns null.

Change-Id: I2767b95af01a0ef78bf1c216579b81ee705e1468
 2016-03-31 02:17:16 +00:00
Andrii Kulian
b6ba05ffb0 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 
am: ac94586

* commit 'ac945867145c571506a211ccb0a87a3402c4d745':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I34a274c3eca15546d7be85fbb30ac072ff03db7f
 2016-03-31 02:17:08 +00:00
Ruchi Kandoi
29e747140f Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev 
am: 93cfef4

* commit '93cfef460c4d15c706bfb03456a00f6e6086b989':
  Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."

Change-Id: I87c4daea7bd3ed5eaca1ac7024059f57a3bc1bec
 2016-03-31 02:16:57 +00:00
Mihai Nita
1dae8e1f0d Merge "Ignore stopwords in the Arabic locale sort" into nyc-dev 
am: aeaa8d6

* commit 'aeaa8d62563da3b615f54b564e01aba3a98f29da':
  Ignore stopwords in the Arabic locale sort

Change-Id: Id130f4608b116a88cdf40d2d7c2a6be2309284e9
 2016-03-31 02:16:45 +00:00
Felipe Leme
25530a0a8b Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev 
am: d847b51

* commit 'd847b511d3828fa6cb7a740ecd8876f16524f684':
  Minor tweaks on Scoped Directory Access:

Change-Id: I03bb83eccb448ced4c919ada46102c514930ec1b
 2016-03-31 02:16:33 +00:00
Vladislav Kaznacheev
ce230a40d2 Add wallpaper input consumer to WindowManagerService 
am: 6013a55

* commit '6013a558262d149023b32ab175c9b885b6c5b81d':
  Add wallpaper input consumer to WindowManagerService

Change-Id: If3da7b370d52692dd2ed0b9c19b65744358cbc0b
 2016-03-31 02:16:26 +00:00
Adam Lesinski
d9b99be587 BatteryStats: Add ble scans to checkin data and start global ble scan timer 
Bug:27930206
Change-Id: Ieb81eddeb0ac54ad93615f3abdc18cbcab19a729
 2016-03-30 18:58:27 -07:00
Siyamed Sinir
dcb2574ae1 Merge "Reset FontMetrics at each new measurement in BoringLayout" into nyc-dev 2016-03-31 01:50:30 +00:00
Jeff Sharkey
281c182cb8 Keep COLUMN_LOCAL_URI working for now. 
Bug: 26515039
Change-Id: I48f3ef90443b01fb75a3852e5cfdd83a9bbcac0f
 2016-03-30 19:46:42 -06:00
Vladislav Kaznacheev
b4142f70e5 Merge "Revert "Add wallpaper input consumer to WindowManagerService"" into nyc-dev 2016-03-31 01:43:11 +00:00
Vladislav Kaznacheev
2769e7ebe9 Revert "Add wallpaper input consumer to WindowManagerService" 
This reverts commit 6013a55826.

Change-Id: I2711afe2e97a8b9a4bd94193202cb83113b3bd7e
 2016-03-31 01:42:02 +00:00
Philip P. Moltmann
740a5f023e Merge "Add the print service recommendation service" into nyc-dev 2016-03-31 01:33:17 +00:00
Tomasz Mikolajewski
5f53f65311 Unhide DocumentsContract.EXTRA_ORIENTATION. 
Bug: 27351468
Change-Id: Ib205dfe5fab995880407792cc15178aaf1ac15e6
 2016-03-31 10:30:46 +09:00
Sudheer Shanka
d2a968f9c3 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev 2016-03-31 01:14:21 +00:00
Andrii Kulian
ac94586714 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 2016-03-31 00:57:42 +00:00