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

112033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu(). 
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
 2013-09-03 11:40:35 -07:00
Mindy Pereira
47fd325779 am 5c2dfa8a: Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 
* commit '5c2dfa8a21e7bd4e07e00f268d30058b654aa099':
  Fix build; add new ScaleGestureDetector constructor
 2013-09-03 11:33:57 -07:00
Dirk Dougherty
5e52ee6ecf Doc change: small refinement of brand usage guidelines. 
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
 2013-09-03 11:32:09 -07:00
Mindy Pereira
5c2dfa8a21 Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 2013-09-03 18:32:02 +00:00
Mindy Pereira
6ad955ef97 Fix build; add new ScaleGestureDetector constructor 
Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
 2013-09-03 11:27:02 -07:00
Svetoslav Ganov
38c5b2b879 am ad0ec16f: Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 
* commit 'ad0ec16fbe27e69e22b90ad9f1b9e322d8c20e8d':
  Bug fixes in the printer dialog activity and fused printer loader.
 2013-09-03 11:04:19 -07:00
Svetoslav Ganov
d0871ac62f am e1de4b32: Merge "Crashes in TouchExplorer on two finger swipe." into klp-dev 
* commit 'e1de4b3216055d53e21ace27c0281359847332a2':
  Crashes in TouchExplorer on two finger swipe.
 2013-09-03 11:04:16 -07:00
Svetoslav Ganov
ad0ec16fbe Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 2013-09-03 18:02:58 +00:00
Svetoslav Ganov
e1de4b3216 Merge "Crashes in TouchExplorer on two finger swipe." into klp-dev 2013-09-03 18:02:15 +00:00
Santos Cordon
8bd2eb314b am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '90a5df1ee8c89ca17df93d9ecf95652b2ae619f4':
  Revert "Add permissions for the InCallUI Split."
 2013-09-03 10:49:15 -07:00
Mindy Pereira
197602ded7 am 510caf30: Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 
* commit '510caf30d2f7b240ee0cb470f52299af8576ea8d':
  Add doubletap swipe to scalegesturedetector
 2013-09-03 10:49:12 -07:00
Leon Scroggins III
050129b44a am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev 
* commit '3f8da09136087bd4f97c1e13e2fb7f8cfb81941c':
  Change name back to CreateJavaInputStreamAdaptor.
 2013-09-03 10:49:07 -07:00
Jeff Tinker
82bdd3f703 am f2455df4: Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev 
* commit 'f2455df4f85a2b02dee0da1a711e3b1292126c97':
  Revert "Enhancement for OnInfo callback on DRM Framework"
 2013-09-03 10:49:04 -07:00
Kenny Root
627f28c015 resolved conflicts for merge of 7e0609eb to klp-dev-plus-aosp 
Change-Id: I9d8fcccc51a61f769bde2c9912eea16a4b4df001
 2013-09-03 10:46:09 -07:00
Santos Cordon
90a5df1ee8 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-03 17:43:29 +00:00
Santos Cordon
b6c46d2381 Revert "Add permissions for the InCallUI Split." 
This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6.

Change-Id: I40e311174898a741f5053501290833420355ad03
 2013-09-03 17:42:04 +00:00
Mindy Pereira
510caf30d2 Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 2013-09-03 17:38:36 +00:00
Leon Scroggins III
3f8da09136 Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev 2013-09-03 17:37:10 +00:00
Jeff Tinker
f2455df4f8 Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev 2013-09-03 17:35:57 +00:00
Kenny Root
7e0609eb67 Merge changes Ic710807d,I88dfcc8c into klp-dev 
* changes:
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
 2013-09-03 17:28:41 +00:00
Martijn Coenen
ca12d4556c am dd592e2a: Merge "HCE API review." into klp-dev 
* commit 'dd592e2a0d731c061d316a2286084a6a59633390':
  HCE API review.
 2013-09-03 10:28:26 -07:00
Martijn Coenen
dd592e2a0d Merge "HCE API review." into klp-dev 2013-09-03 17:25:01 +00:00
Jean-Michel Trivi
85d8eb6916 am 4a5931e2: Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 
* commit '4a5931e2ae3ce0e117dcdbbb47e9aaa5ce4a35dc':
  Public API for RemoteControlClient ratings and editable metadata
 2013-09-03 10:24:53 -07:00
Jean-Michel Trivi
4a5931e2ae Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 2013-09-03 17:19:55 +00:00
Baligh Uddin
d99d648156 Import translations. DO NOT MERGE 
Change-Id: Icaf13bfca4c997cd0b1bddc91c96351cb5d5a20e
Auto-generated-cl: translation import
 2013-09-03 10:16:06 -07:00
Jeff Tinker
490dd056bd Revert "Enhancement for OnInfo callback on DRM Framework" 
This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf.

Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug: 10542864

Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
 2013-09-03 10:13:17 -07:00
Baligh Uddin
8213e34b14 Import translations. DO NOT MERGE 
Change-Id: I17ec3c595dbf7291f781fa73ce5772d2a647ae91
Auto-generated-cl: translation import
 2013-09-03 10:07:16 -07:00
Santos Cordon
8fab063abc am 7f60dc57: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '7f60dc57780281030f26a2109a64d0260e976af7':
  Add permissions for the InCallUI Split.
 2013-09-03 09:47:12 -07:00
Kenny Root
c222ddd07f Unhide functions to allow ECDSA support 
Bug: 10600582
Change-Id: Ic710807d7e771737521e0abd83af2f666ec1199c
 2013-09-03 09:45:55 -07:00
Santos Cordon
7f60dc5778 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-03 16:45:24 +00:00
Svetoslav Ganov
38c992841b Crashes in TouchExplorer on two finger swipe. 
1. The logic for finding the active pointer was incorrect. The code was
   iterating over all pointer ids and taking the minimum, i.e. the pointer
   that first went down. The problem was that the down time for pointers
   that are not down was also considered (set to zero), thus sometimes we
   would consider the first pointer that went down to be a pointer that
   is not down at all. Now we are iterating only over the pointers that
   are down.

2. The batched events while waiting to see if the user is exploring or
   gesturing were added even if we were in touch exploration state at which
   point we do not have to batch. As a result we ended up having lefovers
   from a previous gesture when handling the delayed events and crash.

bug:10312546

Change-Id: I4728541ac12e4da4577d22e4314101dd169a52fb
 2013-09-03 09:24:52 -07:00
Baligh Uddin
979a602c74 Import translations. DO NOT MERGE 
Change-Id: Icd9730e462bcfce224e9ddf43bb8ffa3c6cbf905
Auto-generated-cl: translation import
 2013-09-03 09:21:32 -07:00
John Spurlock
1f0c596563 Remove unused status bar icon stat_sys_secure. 
It was moved behind an undocumented setting three yrs ago.

Bug:10502089
Change-Id: Icef0e3deaa9b09afab98bbb76520b47a16da2069
 2013-09-03 12:04:38 -04:00
Svetoslav Ganov
9186d0cb2b Bug fixes in the printer dialog activity and fused printer loader. 
1. Fused printers loader was not using the discovered printers to update the
    historical ones. Now if a historical printer is discovered we update its state
    with the discovered, i.e. most recent, information.

2. Fixed a bug in the destination adapter of the print job config dialog that
    was leading to a crash if all printers item is selected when there are no
    discovered printers.

3.  Updated the add printers asset in the all printers screen.

4. Historical printers were not persisted by the print dialog activity.

5. Reduced the number of printers we send per transation to avoid the binder
   transaction size limit. Added sending of printers in chunks in a place
   this was missing.

Change-Id: I88b54888360bc0e53b06bd260c2b832d0d6454b6
 2013-09-03 08:42:17 -07:00
Leon Scroggins III
c779752508 Change name back to CreateJavaInputStreamAdaptor. 
In order to fix open source builds, change WrapJavaInputStream's
name back to CreateJavaInputStreamAdaptor.

Remove FIXME in CopyJavaInputStream, and return a more generic type,
since the more specific type was only needed by a change in external/webkit,
which is being reverted since it depends on unreleased code.

Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f
 2013-09-03 11:35:00 -04:00
Santos Cordon
bf84eb5ed5 Add permissions for the InCallUI Split. 
Change-Id: Ic759d14acefcea746e0d8e86c0f006d4bc462386
 2013-09-03 08:19:17 -07:00
Kenny Root
a39859889b Add support for DSA and ECDSA key types 
(cherry picked from commit f64386fc26efeb245fd90fabaa47b8c8bf9b4613)

Bug: 10600582
Change-Id: I88dfcc8ca602f55fad54bd8bf043aee460c0de24
 2013-09-03 00:53:04 -07:00
Svetoslav Ganov
9d4620c423 am 96661c42: Merge "System print service enabled after every system reboot" into klp-dev 
* commit '96661c42d0643c129fed60678aa0b8f99d32b456':
  System print service enabled after every system reboot
 2013-09-03 00:26:51 -07:00
Svetoslav Ganov
96661c42d0 Merge "System print service enabled after every system reboot" into klp-dev 2013-09-03 07:24:57 +00:00
Kenny Root
c62a8b71b4 am 333bd17e: am 7adc233c: Merge "Add support for DSA and ECDSA key types" 
* commit '333bd17eec47a78d3ae8081d828ab1440e621e03':
  Add support for DSA and ECDSA key types
 2013-09-03 00:18:40 -07:00
Kenny Root
333bd17eec am 7adc233c: Merge "Add support for DSA and ECDSA key types" 
* commit '7adc233cf8f6f9e2a83a4549a9295d1a3933beab':
  Add support for DSA and ECDSA key types
 2013-09-03 00:15:43 -07:00
Kenny Root
7adc233cf8 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:36 +00:00
Jeff Sharkey
f56ae2b903 am 118cb035: Merge "Filter roots based on incoming request." into klp-dev 
* commit '118cb0353f6dabce1a1d6b550f7fc9eb78c7de87':
  Filter roots based on incoming request.
 2013-09-02 20:55:12 -07:00
Jeff Sharkey
92c7406b85 am 7c925042: Merge "New recents behavior to match spec." into klp-dev 
* commit '7c925042061bf4b80cf80a7e6d94995c62eca7e1':
  New recents behavior to match spec.
 2013-09-02 20:51:44 -07:00
Jeff Sharkey
32bfd2a398 am c22acf6f: Merge "Instance state, fix sharing, Durable objects." into klp-dev 
* commit 'c22acf6f1fc001ad0f1c23c5261f371d63e4106e':
  Instance state, fix sharing, Durable objects.
 2013-09-02 20:51:40 -07:00
Jeff Sharkey
e1dfca2989 am db06adec: Merge "Use Cursors directly when binding documents." into klp-dev 
* commit 'db06adec0d25f57d0fff8788b0081f92f6e5383c':
  Use Cursors directly when binding documents.
 2013-09-02 20:51:37 -07:00
Jeff Sharkey
118cb0353f Merge "Filter roots based on incoming request." into klp-dev 2013-09-03 03:50:56 +00:00
Jeff Sharkey
7c92504206 Merge "New recents behavior to match spec." into klp-dev 2013-09-03 03:50:27 +00:00
Jeff Sharkey
c22acf6f1f Merge "Instance state, fix sharing, Durable objects." into klp-dev 2013-09-03 03:50:10 +00:00
Jeff Sharkey
db06adec0d Merge "Use Cursors directly when binding documents." into klp-dev 2013-09-03 03:50:00 +00:00