Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
242,967 Commits 3 Branches 0 Tags
3720f795ce30f255efe0e4231b5faf61ba4c09fc
Commit Graph

242967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomasz Mikolajewski
3720f795ce Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev am: e1d0cab 
am: f2c62df

* commit 'f2c62df0365c23357bed8178e7651908a730c782':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: I59b4cb74bacbafc22a7e0305813a039d132f65bd
 2016-03-31 03:58:25 +00:00
Tomasz Mikolajewski
f2c62df036 Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 
am: e1d0cab

* commit 'e1d0cabb5f4ccc43d7fa1d84a02a87a8683f8537':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: Ic637439d4d49829f46c64ecced05c838e45fc211
 2016-03-31 03:55:24 +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
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
e1d0cabb5f Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 2016-03-31 03:47:41 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00: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
Jeff Sharkey
2ed876ce42 Merge "Fix DownloadManager tests." into nyc-dev am: 4938d6e 
am: 294163e

* commit '294163e8334163dd5d577d6cfd23a0b5be52ea1e':
  Fix DownloadManager tests.

Change-Id: I7060e603da86f9c8c84021f8fc7050aa7f3c26ef
 2016-03-31 02:48:17 +00:00
Jeff Sharkey
294163e833 Merge "Fix DownloadManager tests." into nyc-dev 
am: 4938d6e

* commit '4938d6e161733b69a291d2ddf16d25efb41030cb':
  Fix DownloadManager tests.

Change-Id: I306883251d72e655a361a30217bf825e0fe8beea
 2016-03-31 02:45:45 +00:00
Jeff Sharkey
4938d6e161 Merge "Fix DownloadManager tests." into nyc-dev 2016-03-31 02:43:21 +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
Aga Wronska
a0f03649f8 Merge "Add menu option to show/hide internal storage." into nyc-dev am: 276dcd7 
am: 0d4b15c

* commit '0d4b15cff7a393f6b29520d70e1334ebf75588f5':
  Add menu option to show/hide internal storage.

Change-Id: Ib9b65ab0c97c8cf44bf89094a3e9723110df0d80
 2016-03-31 02:23:20 +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
912736fa98 Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev am: bc2294b 
am: e6fcfea

* commit 'e6fcfeae6a512b98e52de51fe890327a94fa97b0':
  Revert "Temporary changes to fix crashes during tests."

Change-Id: Ie9548fc0cc15f5112e6ce1464313a4717ddfd718
 2016-03-31 02:23:11 +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
Aga Wronska
0d4b15cff7 Merge "Add menu option to show/hide internal storage." into nyc-dev 
am: 276dcd7

* commit '276dcd7314c7ad8ebe46bfc5290853fabd1c6316':
  Add menu option to show/hide internal storage.

Change-Id: Ia99490623e560111a51814bcb5cd857c3a94ee68
 2016-03-31 02:17:29 +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
e6fcfeae6a Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev 
am: bc2294b

* commit 'bc2294b3c2503105c37d8de4a8cd825189199868':
  Revert "Temporary changes to fix crashes during tests."

Change-Id: I11f2e1c36e7f0ac8c57940b6671c0f815e6c8c73
 2016-03-31 02:17:22 +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
Aga Wronska
276dcd7314 Merge "Add menu option to show/hide internal storage." into nyc-dev 2016-03-31 01:39:12 +00:00
Tomasz Mikolajewski
2b57efb262 Unhide ExifThumbnail.getThumbnailRange() and make it match the comment. 
Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
 2016-03-31 10:36:26 +09:00
Philip P. Moltmann
740a5f023e Merge "Add the print service recommendation service" into nyc-dev 2016-03-31 01:33:17 +00:00
Aga Wronska
774cc932fc Add menu option to show/hide internal storage. 
This reverts commit 7c4395804e.

Bug: 27683276
Change-Id: Id1a310b57ab7fa3c8c14b464786473f211eaf41f
 2016-03-30 18:23:10 -07:00
Sudheer Shanka
bc2294b3c2 Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev 2016-03-31 01:22:37 +00: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
Ruchi Kandoi
93cfef460c Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev 2016-03-31 00:54:25 +00:00