Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,395 Commits 3 Branches 0 Tags
f7e2d8bc686ca1ed8846cd3fe8215d8d1ccbfa8a
Commit Graph

10909 Commits

Author SHA1 Message Date
Alan Viverette
f7e2d8bc68 am 454df191: am ea872139: am a2f47be6: Merge "API Review: Drawable" into mnc-dev 
* commit '454df1916fdb785fe29966a3507729e66a12f426':
  API Review: Drawable
 2015-05-27 21:16:35 +00:00
Alan Viverette
a2f47be64b Merge "API Review: Drawable" into mnc-dev 2015-05-27 20:34:09 +00:00
Cedric Ho
f8e53f8922 am 41964750: am b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 
* commit '41964750d30cee08b75470abf3f09341f75b069a':
  Add getCallingUid() to RecognitionService.Callback.
 2015-05-27 20:31:11 +00:00
Alan Viverette
dfa4646eca API Review: Drawable 
Renames boolean getters to isZzz(), callback from onChange to onChanged.

Bug: 21342040
Change-Id: I9700d645453354b608fd97a832359211d828b52f
 2015-05-27 13:26:41 -07:00
Cedric Ho
2b919d4f69 Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 2015-05-27 17:46:41 +00:00
Cedric Ho
8fedcdad36 Add getCallingUid() to RecognitionService.Callback. 
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
 2015-05-27 09:51:19 -07:00
Jorim Jaggi
187276fe4c am 2b9d74d4: am b0fa2241: am d1e0b949: Merge "Add fingerprint icon" into mnc-dev 
* commit '2b9d74d462860024f920712d4b873140ee4df07d':
  Add fingerprint icon
 2015-05-26 21:41:35 +00:00
Jorim Jaggi
d1e0b9493a Merge "Add fingerprint icon" into mnc-dev 2015-05-26 20:50:48 +00:00
Jorim Jaggi
a65f1d1c4c Add fingerprint icon 
Bug: 20663748
Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8
 2015-05-26 13:49:44 -07:00
Alex Klyubin
e546af01c8 am 7afb0d6e: am a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev 
* commit '7afb0d6e93722eb615af6f68d822ff799ecf9acc':
  Remove KeyStoreParameter.getContext().
 2015-05-26 18:27:56 +00:00
Alex Klyubin
09a3b7f2ac Remove KeyStoreParameter.getContext(). 
This method isn't there in the released API and we don't need it in
the new API.

Bug: 18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9
 2015-05-26 10:44:53 -07:00
Svet Ganov
30bc4f9203 am 0f292360: am 43e181d0: am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev 
* commit '0f292360f87736c2d79671a915f8fa6ef993afbd':
  Hide pakcage installer system APIs.
 2015-05-23 21:07:21 +00:00
Svet Ganov
a759024394 Merge "Hide pakcage installer system APIs." into mnc-dev 2015-05-23 20:31:55 +00:00
Svet Ganov
0b316706b1 Hide pakcage installer system APIs. 
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
 2015-05-23 13:25:11 -07:00
Amith Yamasani
2c38ca0443 am fa41be53: am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev 
* commit 'fa41be53ee9f6c9209f71c0b652df45db49f8ae8':
  Add getPermissionGrantState method in device policy
 2015-05-23 00:39:36 +00:00
Yin-Chia Yeh
89617b1cdc am 7247c6d1: am 5c4def8a: am 5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev 
* commit '7247c6d10ffa741bbe2ddc115326d8c4f4e98adc':
  Camera: update available LSC map mode key type
 2015-05-23 00:09:31 +00:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Yin-Chia Yeh
5cf9d8ac94 Merge "Camera: update available LSC map mode key type" into mnc-dev 2015-05-22 23:40:33 +00:00
Yin-Chia Yeh
656931d36d Camera: update available LSC map mode key type 
Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
 2015-05-22 16:37:27 -07:00
Dianne Hackborn
a8ce9e8363 am 271e92c1: am da517da8: am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 
* commit '271e92c1975da9cd6e1a062db1221f9004b9ea86':
  Improve reporting to apps of transaction too large failures.
 2015-05-22 21:42:19 +00:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy 
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
 2015-05-22 13:55:57 -07:00
Dianne Hackborn
fa4d547d58 Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 2015-05-22 18:52:41 +00:00
Stuart Scott
94b038bbb2 Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
 2015-05-22 11:29:28 -07:00
Fyodor Kupolov
aa590a788b am 5fbbd954: am 13b61b29: am 96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev 
* commit '5fbbd954544f950ab0805bb2d248d44b1c06bdcb':
  Use factory methods for RestrictionEntry
 2015-05-22 16:52:51 +00:00
Vinit Deshpande
e7e219dfd3 am 01ded71a: am 94315b84: am 45261633: Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev 
* commit '01ded71a696f0bd692ac9703c16a7f9c507ef4ea':
  Indicate failed scans with EXTRA_RESULTS_UPDATED
 2015-05-22 16:51:58 +00:00
Fyodor Kupolov
96616a57f3 Merge "Use factory methods for RestrictionEntry" into mnc-dev 2015-05-22 16:21:20 +00:00
Vinit Deshpande
4526163398 Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev 2015-05-22 01:58:38 +00:00
Dianne Hackborn
2d2e2e0cef am ad15bee4: am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev 
* commit 'ad15bee4ff4ead176d4e4fb06c7b579db9cf3cfa':
  Add API to track usage time of apps.
 2015-05-22 01:50:16 +00:00
Selim Gurun
469290e23b am 7f34d973: am 53d3e8c9: am 95821eea: Merge "Clean remaining API related issues." into mnc-dev 
* commit '7f34d973dbe3f39c63f787a43bb94d624eab03a7':
  Clean remaining API related issues.
 2015-05-22 01:37:17 +00:00
Dianne Hackborn
e5c4262109 Improve reporting to apps of transaction too large failures. 
If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on.  Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
  it may include an additional message in it telling you how much
  data was in the parcel being sent, to help you understand why
  this happening.

- In all the framework code paths where we call to the system and
  may fail, convert these failures into a a runtime exception and
  rethrow them back to the app so that it will clearly get the
  above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
 2015-05-21 18:19:50 -07:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Selim Gurun
98fe09cba0 Clean remaining API related issues. 
Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
 2015-05-21 17:56:58 -07:00
Dianne Hackborn
b5a380d409 Add API to track usage time of apps. 
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
 2015-05-21 16:45:29 -07:00
Fyodor Kupolov
f70c9346d6 Use factory methods for RestrictionEntry 
As per API council request, factory methods should be used instead of using
boolean.

Bug: 21343772
Change-Id: Ia0889e46916f4ed7edb942217880cdf9c27771c2
 2015-05-21 15:08:42 -07:00
Vinit Deshpande
29ad7c7000 Indicate failed scans with EXTRA_RESULTS_UPDATED 
This flag indicates if scan was successful and results were
updated. It will be set to false if a scan is not performed
(intentionally) or if it failed to produce any results.

Bug: 20642015

Change-Id: I06a1fdd684932db68891ee28d5a049980f483f0f
 2015-05-21 13:17:03 -07:00
Andy Hung
12d57a3cce am 83fe387b: am d5da651b: am b14b7e18: Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev 
* commit '83fe387bf2ddd2408d07bdbd067bcd1674408170':
  Fix AudioTrack, AudioRecord, AudioFormat API
 2015-05-21 12:44:24 +00:00
Andy Hung
b14b7e188f Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev 2015-05-20 23:01:39 +00:00
Andy Hung
e90a0a88f4 Fix AudioTrack, AudioRecord, AudioFormat API 
Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
 2015-05-20 22:58:31 +00:00
Etan Cohen
e85a3e5458 am 33a95f93: am 14c60bb1: am 466503d0: Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 
* commit '33a95f93ca4856032eef804cfe97a798c6df6748':
  Add Carrier Presence to CP2: Phone
 2015-05-20 22:30:20 +00:00
Etan Cohen
466503d0bd Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 2015-05-20 21:38:07 +00:00
Svet Ganov
733a49fd55 am 393c80cf: am b39fb08b: am 084110bd: Merge "Allow DO/PO to go back to normal permission state." into mnc-dev 
* commit '393c80cfdcb94ed5321de96ce9f2271522d1b555':
  Allow DO/PO to go back to normal permission state.
 2015-05-20 20:47:53 +00:00
Svet Ganov
d8ecc5aee4 Allow DO/PO to go back to normal permission state. 
We have APIs for a DO/PO to fix a permission in a granted or
denied state in which the user cannot manage this permission
through the UI. However, there is no way to go back to the
default state in which the user gets to choose the permission
grant state.

Change-Id: I2562a1d8b1385cd740b44812844ef14c895c2902
 2015-05-20 13:08:58 -07:00
Brian Attwell
05ee17b973 am 258a6b62: am afe2b09c: am 7d383b92: Hide ProviderStatus and Authentication APIs 
* commit '258a6b62e6d41e502a85c4753b93a91be5333fb4':
  Hide ProviderStatus and Authentication APIs
 2015-05-20 18:09:20 +00:00
Brian Attwell
7d383b9271 Hide ProviderStatus and Authentication APIs 
Bug: 21090207
Change-Id: I27b604b9c849e1aad8289c517f5e50c5d0faae0f
 2015-05-20 17:28:35 +00:00
Paul Jensen
e0af3ab4f8 am d3a56eda: am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev 
* commit 'd3a56eda9d3d4320721c8fe8c50c247e895a63a7':
  Undeprecate android.net.ProxyInfo as it's still used.
 2015-05-20 13:18:09 +00:00
Paul Jensen
cb7c035081 Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev 2015-05-20 10:49:04 +00:00
Wei Wang
17bb1205d7 am 8c4bad20: am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev 
* commit '8c4bad200cc21cac3626bb1ab022448b85cc6a33':
  setCallbackType should be public for onlost/onfound apis
 2015-05-19 23:17:08 +00:00
Santos Cordon
e7c5dde91a am 455276fd: am b6b0bc36: am 0e2d3f2f: Merge "Add enable/disable properties to phone accounts." into mnc-dev 
* commit '455276fd5f6ac39f833ef7a2dde1a2b322209253':
  Add enable/disable properties to phone accounts.
 2015-05-19 23:05:12 +00:00
Dianne Hackborn
237f4b3d3d am 98e45457: am f24a522c: am 2d9c6015: Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev 
* commit '98e454575cc2038088aedd2a2a7cb01bf8b8e8af':
  Fix issue #20679383: Add text style to assist.ViewNode...
 2015-05-19 23:04:33 +00:00
Prerepa Viswanadham
f5e368ff26 setCallbackType should be public for onlost/onfound apis 
Bug: 21304922
Change-Id: I27ed4f3e00ac13354e3ef75e5686916be0d10918
 2015-05-19 22:04:56 +00:00