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

10931 Commits

Author SHA1 Message Date
Santos Cordon
d10d300110 am 8e5d21b0: am 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev 
* commit '8e5d21b0430a68afd8c2ab5a72164db75e69b490':
  Add extras to Connections/Calls. (1/3)
 2015-05-29 02:04:31 +00:00
Santos Cordon
7cb0925e7e Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev 2015-05-28 23:06:17 +00:00
Dianne Hackborn
e6ca5b3720 am e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev 
* commit 'e6562d903b9e62b4d4c6c08307a39577f15f1c49':
  Add new API to set URI on AssistContent.
 2015-05-28 23:01:05 +00:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent. 
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
 2015-05-28 11:44:58 -07:00
Brian Attwell
f4efdfc51f am 98bc46d1: am 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 
* commit '98bc46d13a523efaf06eae6ddaeb9100d15006a2':
  Deprecate {READ,WRITE}_PROFILE permission
 2015-05-28 18:23:09 +00:00
Svet Ganov
6f51e48dfb am 6e520470: am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 
* commit '6e5204701142b3e1281824ced1ab41813a8c4072':
  Add a normal permission guarding the installer UI - used for stats tracking
 2015-05-28 17:46:09 +00:00
Brian Attwell
8d38a8d84f Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 2015-05-28 17:36:36 +00:00
Santos Cordon
6b7f955c2d Add extras to Connections/Calls. (1/3) 
Two major changes:
1) Add the notion of extras to a Connection.  These extras will be
parceled through to InCallService as Call.getExtras()
2) The previously existing Call.getExtras() has been renamed to
getIntentExtras(). This name better describes the fact that these
particular extras are from the original CALL or INCOMING_CALL intents.

Change-Id: I08c1baf4f08d54757f98012f0c08b423a707c53d
 2015-05-28 09:43:00 -07:00
Svet Ganov
63428ccde7 Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 2015-05-28 15:37:06 +00:00
Svet Ganov
86877e44f0 Add a normal permission guarding the installer UI - used for stats tracking 
bug:2147009

Change-Id: Id020eaf7b852de43966f4ab8231e3f7046e66542
 2015-05-28 08:33:45 -07:00
Brian Attwell
b97df269b5 Deprecate {READ,WRITE}_PROFILE permission 
Now that *_PROFILE permissions are in the same permission
group as *_CONTACTS, these permissions have no visible
impact on the user. However, they complicate developer's
lives and prevent us from using Context#grantUriRequest().

Bug: 21090207
Change-Id: I31e6ae7b0f49c3589071f6a95f8d69a9456c144d
 2015-05-27 19:36:02 -07:00
Zach Johnson
3e1a0d380a am 05dee112: am b8b242de: am 841e7eb9: Merge "Update intents for CarrierService" into mnc-dev 
* commit '05dee112a13b715e29fdff16d57a75256d1ee044':
  Update intents for CarrierService
 2015-05-28 00:37:53 +00:00
Zach Johnson
5c04bd767b Update intents for CarrierService 
Keep the bind intent and the config intent separate.

Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412
 2015-05-27 16:53:09 -07:00
Zach Johnson
9a151920b6 am 854d9447: am ad13df83: am 68bca39a: Merge "Drop the "Config". Just "CarrierService". It\'s cleaner." into mnc-dev 
* commit '854d9447d67e07c7812e7a9dd3428428429326f8':
  Drop the "Config". Just "CarrierService". It's cleaner.
 2015-05-27 23:41:17 +00:00
Zach Johnson
42ecc9eb90 Drop the "Config". Just "CarrierService". It's cleaner. 
b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
 2015-05-27 15:30:31 -07:00
Alan Viverette
321d299bfb am 4120e943: am 36fe17ac: am 60bf94e3: Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 
* commit '4120e943471bbaea2bff58fe6b9d0182fe77a23c':
  Move ApplicationInfo hardware acceleration to public flags
 2015-05-27 22:06:54 +00:00
Chong Zhang
ca50eb4560 am 812443da: am 2b5505ca: am ebdfefa4: Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev 
* commit '812443da5c63079c373998fed830f227af244125':
  MediaCodec: unhide mime type for EAC3
 2015-05-27 22:06:31 +00:00
Alan Viverette
60bf94e3be Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 2015-05-27 21:30:07 +00:00
Alan Viverette
d70b9e7aea Move ApplicationInfo hardware acceleration to public flags 
Bug: 21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78
 2015-05-27 14:29:20 -07:00
Chong Zhang
ebdfefa496 Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev 2015-05-27 21:17:12 +00:00
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
Chong Zhang
52c58bb699 MediaCodec: unhide mime type for EAC3 
bug: 18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
 2015-05-27 14:07:29 -07: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