Commit Graph

243867 Commits

Author SHA1 Message Date
Amith Yamasani
951dcd6806 Merge "Update interface quota on the handler" into nyc-dev
am: db0f3a7

* commit 'db0f3a708acdb4640e00cce848294d6f7dc88fa3':
  Update interface quota on the handler

Change-Id: I822ead05d427c315be20d19e8dd94703eb82c6c8
2016-04-15 18:35:07 +00:00
Craig Donner
1cdff8b536 Merge "Fix VR mode handling when the screen blanks and unblanks." into nyc-dev
am: fc465bf

* commit 'fc465bf6bf456f5be1790b2ba60ea3da9c671d71':
  Fix VR mode handling when the screen blanks and unblanks.

Change-Id: I6f7f76da532e6e1f07ec12b213b6b880f3d29d6a
2016-04-15 18:35:05 +00:00
Amith Yamasani
db0f3a708a Merge "Update interface quota on the handler" into nyc-dev 2016-04-15 18:22:13 +00:00
Craig Donner
fc465bf6bf Merge "Fix VR mode handling when the screen blanks and unblanks." into nyc-dev 2016-04-15 18:22:02 +00:00
Mitchell Wills
740c433b59 Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev
am: 2657981

* commit '2657981836e6fabbfdb8952716d26de0ac4942ba':
  Connect WifiScanner synchronously without sync barrier

Change-Id: I787b40d618a6013a93dfe3859695114f21c95fa7
2016-04-15 18:19:22 +00:00
Donghyun Cho
410f39c806 Merge "CEC: Remove listener records only if they are currently used" into nyc-dev
am: 23cd9da

* commit '23cd9dab01bff3ce7bd2fd275411fc99a903f2b4':
  CEC: Remove listener records only if they are currently used

Change-Id: I78186db4ad9369dfe90969bbbb680cd463e642d5
2016-04-15 18:19:21 +00:00
Mitchell Wills
2657981836 Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev 2016-04-15 18:10:46 +00:00
TreeHugger Robot
23cd9dab01 Merge "CEC: Remove listener records only if they are currently used" into nyc-dev 2016-04-15 18:10:24 +00:00
Felipe Leme
1575c02071 Merge "Added new actions for Data Saver stats." into nyc-dev
am: 82a0cca

* commit '82a0ccac6a74b17b6499bc06bb7eb0e5f942887a':
  Added new actions for Data Saver stats.

Change-Id: I0f9d026ef40c75f9f4179e323dbefc8618ecedf8
2016-04-15 18:03:01 +00:00
Abodunrinwa Toki
76ae13a898 Merge "Update FloatingToolbar overflow button." into nyc-dev
am: f061f2e

* commit 'f061f2e706afdf0c455482c71829aaa1d0b76884':
  Update FloatingToolbar overflow button.

Change-Id: I727af3ed4df29cf615505865193012c2290547d4
2016-04-15 17:56:31 +00:00
Doris Liu
7611bd1d96 Merge "Fix ref count of fillGradient and strokeGradient" into nyc-dev
am: da62de4

* commit 'da62de4f65ccffc4734299f82f1c9ce4836e1c58':
  Fix ref count of fillGradient and strokeGradient

Change-Id: Id4aa38d26fd568f4a312fd5ba507306b84ce8ac7
2016-04-15 17:56:30 +00:00
TreeHugger Robot
82a0ccac6a Merge "Added new actions for Data Saver stats." into nyc-dev 2016-04-15 17:53:43 +00:00
Abodunrinwa Toki
f061f2e706 Merge "Update FloatingToolbar overflow button." into nyc-dev 2016-04-15 17:52:09 +00:00
Doris Liu
da62de4f65 Merge "Fix ref count of fillGradient and strokeGradient" into nyc-dev 2016-04-15 17:47:25 +00:00
Dongwon Kang
d39f94583a Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev
am: 6f8476d

* commit '6f8476dc155805f121f8236e0c81e9aa7d3cd40d':
  TIF: Specify the default implementation of onTune(Uri, Bundle)

Change-Id: I522861bcc9e21105d22af63e4444779a8c3a91b6
2016-04-15 17:47:05 +00:00
Todd Kennedy
9ed9ea93da Fix parse flags
am: d022ac2

* commit 'd022ac21ebcb441314b80b6d8f0656939f2480e5':
  Fix parse flags

Change-Id: I6dac4b1fea72cbc099251d183fcad81084f0d791
2016-04-15 17:40:47 +00:00
TreeHugger Robot
6f8476dc15 Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev 2016-04-15 17:39:14 +00:00
Todd Kennedy
d022ac21eb Fix parse flags
Setting PARSE_IS_SYSTEM to the parse flags happens long after the
APK is actually parsed. So, we fail to pick up the boot aware and
protected storage attributes. Instead, always pull them from the
manifest, but, remove the flags if the package is not actually a
system package.

Also, we were incorrectly skipping certificate verification if
the flag PARSE_IS_SYSTEM was set. However, this flag is used for
_any_ system package -- whether it's physically on /system or if
it's an unbundled update. Instead, we should only skip this step
if the flag PARSE_IS_SYSTEM_DIR. We can implicitly trust any
APK actually stored in /system.

On a different note ... At some point, we will break apart the
parse flags into actual parse flags [i.e. those that change
physically parsing an APK] and policy flags [i.e. those that
change the interpretation of the APK contents].

Bug: 28116074
Bug: 28088617
Change-Id: I85246b0cb18fb5647df3618107910e288137fbc7
2016-04-15 17:04:14 +00:00
Sungsoo Lim
32a21cd4a4 Merge "Use a binder instead of a bundle in removeSubscriptionWithOptions" into nyc-dev
am: 067f821

* commit '067f821ec84d3bcb556a8de77f3e3d3b8c042186':
  Use a binder instead of a bundle in removeSubscriptionWithOptions

Change-Id: Ie6cd52b5169c9b29d437fc04fc1cd71881eede22
2016-04-15 16:49:22 +00:00
Donghyun Cho
fbbeb3e54a CEC: Remove listener records only if they are currently used
HdmiControlService manages listeners in listener record instances, and
remove them when binders become disconnected. However, if the listener
and its record are replaced due to new listener, the record for the new
listener should not be set as null by previous binder's disconnection
signal.

Bug: 28069465
Change-Id: I2984d8f93d6443048cf5d3f2988b3c6cf362f012
(cherry picked from commit f5c2a1f58dc95b9800ffb6ebf405c11acc6626b2)
2016-04-15 16:47:03 +00:00
Sungsoo Lim
067f821ec8 Merge "Use a binder instead of a bundle in removeSubscriptionWithOptions" into nyc-dev 2016-04-15 16:42:48 +00:00
Makoto Onuki
0da2457a9b Merge "Remove all icon bitmaps when a publisher is uninstalled." into nyc-dev
am: 1c685d2

* commit '1c685d2a2b4fe8b5c2b31b7c53aa8455fc1530ee':
  Remove all icon bitmaps when a publisher is uninstalled.

Change-Id: I601089c6c8e4d36dbbdb201f237bb1c7448726da
2016-04-15 16:39:04 +00:00
Makoto Onuki
1c685d2a2b Merge "Remove all icon bitmaps when a publisher is uninstalled." into nyc-dev 2016-04-15 16:34:20 +00:00
Amith Yamasani
3646cbdfe7 Update interface quota on the handler
This avoids making expensive netd calls while holding the mRulesLock

Doesn't fix the problem of turning on hotspot while WiFi was connected.
It is no longer blocked on isNetworkMetered() call though.

Partial fix for following bugs...
Bug: 27857665
Bug: 28201280
Change-Id: I62f3c0b0571292cc1e156b48ce3329def41cdd07
2016-04-15 09:17:16 -07:00
Felipe Leme
3ff576454b Added new actions for Data Saver stats.
BUG: 28166693
Change-Id: I9b7bba21da622ade9a419f3717a2d18a87f4143d
2016-04-15 09:10:17 -07:00
Benjamin Franz
2f6a94511b Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev
am: a900359

* commit 'a90035950019434012f32b8dbc5d278894484df3':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: I52db7e2e2fdb923c9fcd231a32bec0b2f11689c9
2016-04-15 15:41:57 +00:00
Benjamin Franz
a900359500 Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev 2016-04-15 15:34:52 +00:00
Raph Levien
98a2334b96 Merge "Don\'t do layout in hasGlyph for codepoint + vs" into nyc-dev
am: 6e49a7fc

* commit '6e49a7fc6d723963393795ee3fef213a59904097':
  Don't do layout in hasGlyph for codepoint + vs

Change-Id: I0ea9c5b553239fbfb6d3517e869bd854fbf8837c
2016-04-15 15:29:46 +00:00
Julia Reynolds
ebef0414ae Merge "Notification slider update." into nyc-dev
am: 9e8bc7c

* commit '9e8bc7c68584ccec5cf78a9bc5786955898965bd':
  Notification slider update.

Change-Id: Ie3884755eb405016b74ec58f713d5ef723baffc2
2016-04-15 15:23:50 +00:00
Raph Levien
6e49a7fc6d Merge "Don't do layout in hasGlyph for codepoint + vs" into nyc-dev 2016-04-15 15:20:22 +00:00
Julia Reynolds
9e8bc7c685 Merge "Notification slider update." into nyc-dev 2016-04-15 15:18:24 +00:00
Benjamin Franz
bc33c8290f Revert "Revert "Throw security exception for non-parent aware APIs""
This reverts commit a26c626564.

Bug: 27532279
Change-Id: I0c0394a8abf12e7382e7083a0b9d7f8385c3a63d
2016-04-15 16:08:35 +01:00
Julia Reynolds
4d920ff6eb Notification slider update.
Bug: 27558254
Change-Id: I5e03aacf3aafb900f45d227a031a5dbb328ba18f
2016-04-15 11:03:53 -04:00
Benjamin Franz
12e4b3310b Merge "Don\'t show the unlock notification when Work mode is off" into nyc-dev
am: 23abc59

* commit '23abc598a5bdeb5d1cf66f83ff14eb3f440d5a9a':
  Don't show the unlock notification when Work mode is off

Change-Id: I7da82038f231d5217a9544a0e64718a0284aa0a5
2016-04-15 14:58:56 +00:00
Benjamin Franz
f1320d1d7f Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev
am: 2f4c229

* commit '2f4c2299c7ef4b9d604b9833c790a7afd2ed75af':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I0d84934a978205c283b846b7412446a064aac01c
2016-04-15 14:58:54 +00:00
Benjamin Franz
23abc598a5 Merge "Don't show the unlock notification when Work mode is off" into nyc-dev 2016-04-15 14:53:42 +00:00
Benjamin Franz
2f4c2299c7 Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev 2016-04-15 14:53:17 +00:00
Ricky Wai
29e2e8ca33 Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev
am: a4c0b1d

* commit 'a4c0b1de1a33219b4f8ef1cdfc4e7641ac246f4b':
  Fix cannot unlock keyguard when work challege is unified and work mode is off

Change-Id: Ib1f9d7a955168f92b67c55e0d570e7fff00ae279
2016-04-15 13:48:58 +00:00
Ricky Wai
a4c0b1de1a Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev 2016-04-15 13:44:54 +00:00
Benjamin Franz
f02420c5e1 Maybe decrypt user when quiet mode is disabled
When quiet mode is disabled for a user and that user is not currently
decrypted, we show a confirm credentials screen to trigger decryption
of that user. Only if that was successful, do we actually disable quiet
mode.

Bug: 27764124
Change-Id: Ib1f649194d89e225dad62c14f3ddba1fa3d79da2
2016-04-15 14:12:41 +01:00
Abodunrinwa Toki
cef2cd6e52 Update FloatingToolbar overflow button.
1. Change the background ripple to the type used in the ActionBar.
   It looks better.

Bug: 28206428
Change-Id: I2c3ebdc2479ec554c6b06d637b418a52a1794d7b
2016-04-15 13:50:22 +01:00
Lorenzo Colitti
fb83e07ada Merge "Metrics logging for DNS queries." into nyc-dev
am: 46dc79ce

* commit '46dc79cecf2daf1a0e1ec392c56fcb4f7c7a8eaf':
  Metrics logging for DNS queries.

Change-Id: Ie8882a735591a28af490478a479cc60d2e853fde
2016-04-15 11:22:49 +00:00
TreeHugger Robot
46dc79cecf Merge "Metrics logging for DNS queries." into nyc-dev 2016-04-15 11:14:57 +00:00
Nicolas Prevot
8a75d871ae Merge "Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator." into nyc-dev
am: 428fdd1

* commit '428fdd104c6877889da1af2d35af41d5c14833c9':
  Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator.

Change-Id: I34078f980125dd4d170c553dbc84e90d2b910243
2016-04-15 09:57:43 +00:00
Nicolas Prévot
428fdd104c Merge "Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator." into nyc-dev 2016-04-15 09:52:56 +00:00
Lorenzo Colitti
c8a0754b3d Disambiguate NetworkCallback JavaDoc.
am: 88bc0bb

* commit '88bc0bbb13cee43e777fd88c2681d1f033faece5':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ib930e2516d2a6d2027ea35ab8d978bca8faa7a20
2016-04-15 09:52:13 +00:00
Ricky Wai
f6ef828a74 Fix cannot unlock keyguard when work challege is unified and work mode is off
Bug: 28138657
Change-Id: I20e2f571d9ac76c0cd92251de7e068f6c7fb3367
2016-04-15 09:21:17 +00:00
Lorenzo Colitti
43724734d7 Metrics logging for DNS queries.
Bug: 28204408
Change-Id: I05fc9b580aa20d99e8766057e17a38b5eb6267e8
2016-04-15 16:54:39 +09:00
Lorenzo Colitti
88bc0bbb13 Disambiguate NetworkCallback JavaDoc.
The JavaDoc for many of the requestNetwork and
[un]registerNetworkCallback APIs incorrectly mentions the
PendingIntent version of the APIs instead of the NetworkCallback
version.

Also fix a minor issue in the registerDefaultNetworkCallback
JavaDoc: the default network request is an implementation detail,
so don't mention it. Instead, talk about the "system default
network".

Change-Id: Id94d98261daa2bd768c10e033cb8092729b21c91
2016-04-15 16:24:13 +09:00
Robert Carr
36211c089d Merge changes Id603816c,I86e41324,I025d0558,I44d8dbac,Iabfc2e81, ... into nyc-dev
am: bb9fb19

* commit 'bb9fb194f85225fcf0360fc53da51f12a649bd1b':
  Only set mResizedWhileNotDragResizing for base windows.
  Fix Task dim with docked resize.
  Correct window replacement string comparison.
  Replace DimLayers with windows.
  Prevent premature window replacement.
  Correctly prevent entrance animation for replacing windows.
  Replace secondary app windows across activity relaunch.

Change-Id: Idd6d2aff728ede67408671b7ab928f24c04e4934
2016-04-15 06:26:15 +00:00