drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,245 Commits 1 Branch 0 Tags
Commit Graph

199245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
8f2d767f4e Fixed a bug where the statusbar was still visible while dozing 
Bug: 18903923
Change-Id: I9c0c85e40ff7e7be2e9c4122fe5786de3649426c
 2015-06-15 20:55:04 -07:00
Jim Miller
b1c6208c27 Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev 2015-06-16 03:48:58 +00:00
Erik Kline
0d16281a03 Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 2015-06-16 03:43:56 +00:00
Jim Miller
599ef0e3cd Limit number of fingerprint templates that can be enrolled per device user 
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account.  This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.

Fixes bug 20731847

Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28
 2015-06-15 20:42:54 -07:00
Paul Jensen
434dde84ee Remove dead hidden ConnectivityManager and NetworkInfo APIs. 
- There are no callers of
  NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
  code that deals with mIsConnectedToProvisioningNetwork being true,
  including the two ConnectiviyManager APIs.
- There are no callers of
  ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
  the code that reads this URL.
- There are no callers of
  ConnectivityManager.captivePortalCheckCompleted(), so remove this
  API which is currently a no-op.

Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
 2015-06-16 02:07:36 +00:00
Daichi Hirono
8ba8c919fe am 4e3fb992: am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev 
* commit '4e3fb992b7e5b84dfd54552cba1890eeb0296e46':
  Fix API doc of MtpDevice#getObjectHandles.
 2015-06-16 01:49:38 +00:00
Daichi Hirono
4e3fb992b7 am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev 
* commit '100e1c9235720ac020a20009da8b85f64efd4c11':
  Fix API doc of MtpDevice#getObjectHandles.
 2015-06-16 01:38:31 +00:00
Adrian Roos
e99695eeff am 5f6e00d8: am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev 
* commit '5f6e00d809ae8b027ba84ccd9363742f1401e323':
  Fix unnecessairy announcements when collapsing shade
 2015-06-16 01:31:53 +00:00
Ruben Brunk
629923b56e am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit 'e9a1f181ee35dd376803ea98214e1bdbdc9250ef':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:31:49 +00:00
Christopher Tate
0375282aa2 am 73f2f66a: am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev 
* commit '73f2f66ae0292713ffa2c13f2293d79319c36623':
  Clean up app-link verification policy
 2015-06-16 01:31:44 +00:00
Daichi Hirono
100e1c9235 Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev 2015-06-16 01:30:31 +00:00
Adrian Roos
5f6e00d809 am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev 
* commit '2bfe96513884f0c4a4836a615a80e17a1ba30173':
  Fix unnecessairy announcements when collapsing shade
 2015-06-16 01:27:35 +00:00
Ruben Brunk
e9a1f181ee am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:22:41 +00:00
Christopher Tate
73f2f66ae0 am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev 
* commit '60177af86aca7712e2e442ca8e39376dad33a545':
  Clean up app-link verification policy
 2015-06-16 01:22:36 +00:00
Adrian Roos
2bfe965138 Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev 2015-06-16 01:18:01 +00:00
Adrian Roos
54d031bf03 Fix unnecessairy announcements when collapsing shade 
Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330
 2015-06-15 18:17:16 -07:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Makoto Onuki
3773eff57e am 2ae1caf9: am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev 
* commit '2ae1caf984261113f2b6c1959b4a5ef54b3c16f3':
  Allow killApplicationWithAppId() on secondary users
 2015-06-16 01:12:14 +00:00
Christopher Tate
60177af86a Merge "Clean up app-link verification policy" into mnc-dev 2015-06-16 01:10:48 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions. 
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
 2015-06-15 18:09:33 -07:00
Adam Lesinski
73e999341f am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'f86b2096e5b5e2bae440da8b90d27bc17f8d24a5':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 01:01:01 +00:00
Adrian Roos
64d275c3d6 am 7383bf33: am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev 
* commit '7383bf334d14b3049c8d08cba535335df2a5e515':
  Fix accessibility ghosts in quick settings detail
 2015-06-16 01:00:57 +00:00
Makoto Onuki
2ae1caf984 am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev 
* commit 'e43bf4bb4511ec756512a44164ff79cce3a02348':
  Allow killApplicationWithAppId() on secondary users
 2015-06-16 01:00:49 +00:00
Makoto Onuki
e43bf4bb45 Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev 2015-06-16 00:51:36 +00:00
Chirag Shah
61f794a70f Allow 3P apps to provide structured data within AssistContent. 
For providing structured metadata to the assistant, we've decided to
standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the
data to be specified via:

AssistContent.setStructuredData(String structuredDataJson)

This method can be documented for 3P developers as allowing developers
to provide metadata to the assistant with the JSON-LD standard.

This would be centered more about content displayed on the screen,
rather than actions based, so we added it to the AssistContent class

Updated doc: go/setStructuredData

Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
 2015-06-15 17:48:41 -07:00
Adam Lesinski
f86b2096e5 am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'd5e5151f6ceab498e3a35928c1f6f7a177c1544e':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 00:48:29 +00:00
Adrian Roos
7383bf334d am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev 
* commit 'd719215fed261b41ae29acf87faef00f76c8faa7':
  Fix accessibility ghosts in quick settings detail
 2015-06-16 00:48:24 +00:00
Adam Lesinski
d5e5151f6c Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 2015-06-16 00:46:09 +00:00
Adrian Roos
d719215fed Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev 2015-06-16 00:35:12 +00:00
Makoto Onuki
fa24bd8ab6 Allow killApplicationWithAppId() on secondary users 
Bug 20949609

Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
 2015-06-15 17:32:00 -07:00
Adrian Roos
d366cb130d Fix accessibility ghosts in quick settings detail 
Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.

Bug: 20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d
 2015-06-15 17:28:37 -07:00
Adam Lesinski
8a35137388 Bluetooth energy: fix overflow in calculation 
Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
 2015-06-15 17:19:07 -07:00
Junda Liu
5b26cd31ee am b7f9e8a4: am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit 'b7f9e8a44dae86cefacb8e3a1ca47821a6852050':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:12:58 +00:00
Adrian Roos
f90d4c85f5 am ffb09270: am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev 
* commit 'ffb09270aa675de35a333f3de9cf5638b0de1843':
  Add AssistUtils
 2015-06-16 00:12:54 +00:00
Dianne Hackborn
b8004ff3d4 Fix issue #21816660 (app standby), work on issue #20882522 (voice interact) 
Issue #21816660: More app standby abuse prevention

We now apply the same rules for deciding when an app has counted
as active when the screen is on as when the screen is off; the only
change this really means is that we don't immediately count foreground
services as making an app active both screen on as well as the
existing behavior for screen off.

Also small fix to how we switch into voice interaction mode that
guarantees we immediately switch to the screen on state.

Issue #20882522 VI: voice interactor service not restarted

This fixes some problems in the framework, allowing it to be
correctly restarted (and rolled by to the default voice interactor
if appropriate).  There are still some problems in system UI that
leave things broken in some cases.

Also small fix to how we switch into voice interaction mode that
guarantees we immediately switch to the screen on state.

Change-Id: Ie4fd098a2f5174a2c94f36d30427fb2a9db3d835
 2015-06-15 17:05:04 -07:00
Junda Liu
b7f9e8a44d am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit '73d043232434f3ad37af26615919eac3117536b7':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:00:50 +00:00
Adrian Roos
ffb09270aa am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev 
* commit '6ecdcf2aa01b2510bf6d506b92172dbc32beeec9':
  Add AssistUtils
 2015-06-16 00:00:45 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Adrian Roos
6ecdcf2aa0 Merge "Add AssistUtils" into mnc-dev 2015-06-15 23:49:22 +00:00
Quddus Chong
481f3cc5d3 am 79ae28ec: am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '79ae28ec5f59a0ad3fdb9fff08895d205fd9d362':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 23:39:50 +00:00
Adrian Roos
e96d4cf5c2 am 86e34ca9: am 9f33d6cb: Fix stuck orientation in SetupWizard 
* commit '86e34ca902ea4ef6e22d3b590a468c221620fefa':
  Fix stuck orientation in SetupWizard
 2015-06-15 23:39:44 +00:00
Zhijun He
d8fcc2e359 am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit '5e83c9080c71111955bf7e2559b453ffeb5b2c0d':
  Camera2: fix Surface cast issue
 2015-06-15 23:39:39 +00:00
John Spurlock
aa48a4f2e5 am 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '1e17afa76a76ffd1ac3c8eb9596de5513ca27c28':
  Fix typo in TtsSpan.
 2015-06-15 23:39:34 +00:00
George Mount
533d7a67d9 Have the final setVisibility cause a requestLayout. 
Bug 21770464

Change-Id: I8c501e8a681634cb87857cf9286b888e61101f13
 2015-06-15 16:17:04 -07:00
Quddus Chong
79ae28ec5f am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '0e5dc780f00b6c91d0bcfd46512759c6e8a2a81b':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 23:16:43 +00:00
Adrian Roos
86e34ca902 am 9f33d6cb: Fix stuck orientation in SetupWizard 
* commit '9f33d6cb2ed90e2fff3d99cfcf90f6074b1b9f04':
  Fix stuck orientation in SetupWizard
 2015-06-15 23:16:39 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager. 
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
 2015-06-15 16:12:02 -07:00
Quddus Chong
0e5dc780f0 am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '418ff64748cb866d3dec8a448efffb0cbceec52d':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 23:11:02 +00:00
Adrian Roos
e91750804a Add AssistUtils 
Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a
 2015-06-15 16:07:48 -07:00
Zhijun He
5e83c9080c am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit 'fa4b7fb856a0f978529626fabcddf45fd57ecc3e':
  Camera2: fix Surface cast issue
 2015-06-15 23:06:18 +00:00