Commit Graph

57985 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Felipe Leme
d847b511d3 Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev 2016-03-31 00:49:18 +00:00
Jeff Sharkey
e5c374ef0f Merge "Fix RootsCache invalidation bugs." into nyc-dev am: 09d7741
am: 812dfdd

* commit '812dfdd88d77601ed60a77f9c9d2f4a5f1b34d1c':
  Fix RootsCache invalidation bugs.

Change-Id: I593a3c5f76d4fb5d46217b82a87aa91b3f7bf5d9
2016-03-31 00:36:32 +00:00
sergeyv
aa34eef630 Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev am: 394d3df
am: 761f59c

* commit '761f59c19f1a0e527bb533df16abee7fac166dbd':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Ia6abc695ad05362245d25aa6d8b36fc72c508c3a
2016-03-31 00:36:27 +00:00
Jeff Sharkey
812dfdd88d Merge "Fix RootsCache invalidation bugs." into nyc-dev
am: 09d7741

* commit '09d77417b141288311ce371632bba0a7504854fe':
  Fix RootsCache invalidation bugs.

Change-Id: I26e1e2f1c6830dc2a697260a925b18c0d7eb3a59
2016-03-31 00:32:45 +00:00
sergeyv
761f59c19f Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev
am: 394d3df

* commit '394d3dfb2d9ccd2ca2fd7aad06ef2e9a8458a0c7':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Iab1265b6a4c4ff5291259f7e5d9b96c217ee3141
2016-03-31 00:32:41 +00:00
Vladislav Kaznacheev
6013a55826 Add wallpaper input consumer to WindowManagerService
This is an input consumer similar to the one used when hiding the navbar,
but placed above wallpapers. It might be useful for processing touch
events over "desktop" in freeform MW mode.

Bug:26688904
Change-Id: I9d6d28a624f750ad48fc39f9b149dd1f989cceba
2016-03-31 00:32:39 +00:00
Amith Yamasani
2387932b74 Fix a deadlock due to wtf in BaseBundle
Use Slog.wtf instead of Log.wtf, so that it is
asynchronously reported.

Mark incoming application restrictions as defusable
since they are being unparceled.

Bug: 27811728
Change-Id: I166de69a74417e439ec5ef9159fbbfbfe711dde6
2016-03-30 17:28:53 -07:00
Jeff Sharkey
09d77417b1 Merge "Fix RootsCache invalidation bugs." into nyc-dev 2016-03-31 00:27:21 +00:00
Philip P. Moltmann
9dcb86a48d Add the print service recommendation service
This service connects through the print manager to the print spooler:

PrintSpooler.AddPrintersActivity <-> PrintManager <-> PrintManagerService <-> UserState <-> RemotePrintServiceRecommendationService <-> PrintRecommendationService <-> PrintRecommendationServiceImpl

Hence there is a lot of mindless plumming.

The actual changes are only in the AddPrintersActivity which is extended
to show another list of services: The recommended services.

The PrintServiceRecommendationService is based on the experimenal print
service stubs provider. This provider was contributed the Android by
Mopria. As this services uses Android own network discovery service most
code from the experimental provider goes away. In fact the only logic
left over is the selections of mdns-txt fields to look at and the
printer vendor configuration.

This relies on the Android MDNS to get fixed (Bug: 27696905). This also
does not deal with how to update the recommendation service.

Bug: 24533249
Change-Id: I6edc6e25fc08a50d478b61c71bb8ea158b08624c
2016-03-30 17:21:07 -07:00
Siyamed Sinir
70f660f2d6 Reset FontMetrics at each new measurement in BoringLayout
Reset FontMetrics object used in BoringLayout.isBoring to get updated
and correct FontMetrics as a result of measurement.

Bug: 26704088
Change-Id: If77b0edba8dc4b5b1738a802c5f49e112e47b4f2
2016-03-30 17:17:05 -07:00
Sudheer Shanka
549b969280 Return null value if getActiveAdminUncheckedLocked returns null.
- Split per user version of getUserRestrictions into a separate method
  in DPMS and make the per-user version return null if the admin
  parameter is not a valid one.
- Update isAccessibilityServicePermittedByAdmin and
  isInputMethodPermittedByAdmin to return false if the admin parameter
  is not a valid one.

Bug: 27909087
Change-Id: I6f4cae6552cbfe02dc4a92b04eeeddf0314e0974
2016-03-30 17:12:07 -07:00
Sergei Vasilinetc
394d3dfb2d Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev 2016-03-30 23:42:34 +00:00
Felipe Leme
2ac876945b Minor tweaks on Scoped Directory Access:
- Only allow entire directory access on non-primary volumes.
- Do not display primary storage label on scoped access.

BUG: 27743842
BUG: 27676858
Change-Id: I9884fb1e2df3534fceebc5d5bef44adfb758724c
2016-03-30 16:42:10 -07:00
Jeff Sharkey
7732e1e544 Fix RootsCache invalidation bugs.
When RootsCache is still running and it detects a provider/package
change, it needs to force reload roots.  Also fix cache invalidation
bug in ContentService to allow for Uri prefix matches.

Mark internal storage broadcasts with flag to bypass new background
checks.

Bug: 27759529
Change-Id: I9d9c6fe15d8640ff56ae7214afb3bac673682c28
2016-03-30 17:14:25 -06:00
Lorenzo Colitti
f545e52e95 Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev am: 7d4ed2f
am: 882f62d

* commit '882f62dd1a49bdc9ed5a7f13423de0075911d70a':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I201c7099b71fed9edc037ce1d5738086aab35d28
2016-03-30 23:12:11 +00:00
Lorenzo Colitti
882f62dd1a Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev
am: 7d4ed2f

* commit '7d4ed2f5aba19a6b1efb7dc0772f7debfa8a7299':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I86ee864b37109cac50dacbd34685c9c000fb763b
2016-03-30 23:09:25 +00:00