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

105787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
3ddee7d6e9 am fd0b0072: am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 
* commit 'fd0b0072db6d89c85a5ea20383a1c3dc289d1d38':
  Remove scan notification dialog on wifi off
 2013-04-30 08:54:22 -07:00
Nick Kralevich
b7294d74dd am 5dc2ac4d: am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '5dc2ac4d7b5fdc7d3c1d9c60c47ad654ca55738d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-30 08:54:18 -07:00
Christopher Tate
83725360f9 am 21675166: am bd1730de: Merge "Document the \'aapt dump strings\' command" 
* commit '21675166345646f5bb278af487e69604290f09b0':
 2013-04-30 08:54:13 -07:00
Kenny Root
10dd0d818e am d334cb13: am d152f7ec: Merge "Don\'t use X509CertImpl directly" 
* commit 'd334cb13d694a4f1c6b885070ec48033366a4b37':
 2013-04-30 08:54:02 -07:00
Kenny Root
f80d45bfc4 resolved conflicts for merge of 3424b817 to master 
Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b
 2013-04-30 08:45:12 -07:00
Zhentao Sun
752625c844 am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '460778f10475bb9fa02cbfe8af7faef38807435c':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-30 08:31:46 -07:00
Kenny Root
2074fcb4dd resolved conflicts for merge of ee4e9530 to master 
Change-Id: I33931a962aff0ee8f6a04972afb0147e46b57baf
 2013-04-30 08:29:25 -07:00
Baligh Uddin
592190d234 Merge "Import translations. DO NOT MERGE" 2013-04-30 14:56:13 +00:00
Baligh Uddin
d976fe792e Import translations. DO NOT MERGE 
Change-Id: I1c5619a53271ddb3289ef2b6527274ef252e35e0
Auto-generated-cl: translation import
 2013-04-29 22:48:39 -07:00
Baligh Uddin
4431fbea94 Import translations. DO NOT MERGE 
Change-Id: I98754953f5b7d08dd0bac3510be1c5c082529b79
Auto-generated-cl: translation import
 2013-04-29 22:34:34 -07:00
Mike Lockwood
16ac261b36 Merge "Fix javadoc errors for @deprecated tags with no explanatory comment" 2013-04-30 01:24:54 +00:00
Mike Lockwood
322780496f Fix javadoc errors for @deprecated tags with no explanatory comment 
Change-Id: I38a31facf7d4a9cd13645516f25b4305df65c618
 2013-04-29 18:21:25 -07:00
Jeff Sharkey
9e5045db93 Merge "Add longpress support to keyevent." 2013-04-30 01:18:30 +00:00
Mike Lockwood
17195e0378 Merge "Remove obsolete OMA-DRM support" 2013-04-30 00:00:00 +00:00
Mike Lockwood
853ad6fbe3 Remove obsolete OMA-DRM support 
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
 2013-04-29 16:48:13 -07:00
Irfan Sheriff
fd0b0072db am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 
* commit '9f844790f305338de4fa3adda5e125c811f280ca':
  Remove scan notification dialog on wifi off
 2013-04-29 16:01:55 -07:00
Irfan Sheriff
9f844790f3 Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 2013-04-29 22:58:50 +00:00
Nick Kralevich
5dc2ac4d7b am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '7318b84054144c2461fd9392870691b394b44b89':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:55:02 -07:00
Nick Kralevich
7318b84054 am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'ec3396af9857bd50c6ccac692ecc12ab459239d2':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:53:04 -07:00
Nick Kralevich
ec3396af98 am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '0412d9c7c7e5977e1ffbb3a28bba9f37807876a7':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:50:14 -07:00
Nick Kralevich
0412d9c7c7 am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '4d17834ab3d4850352f3d33742945dad61722cd5':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:48:05 -07:00
Nick Kralevich
4d17834ab3 am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'b83e8b693b6738ba8e778d556ccdba629d372b52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:46:21 -07:00
Nick Kralevich
b83e8b693b am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '292c979a0f1e503422924421557b146cd28fc0d2':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:44:43 -07:00
Nick Kralevich
292c979a0f am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'd440ca76029ab6f0909fdd9495941e04b90e5da7':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:42:54 -07:00
Nick Kralevich
d440ca7602 am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:41:36 -07:00
Nick Kralevich
f3a5323cc6 am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '6d8f5b755b133b308204b84145d773d401cdcd52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:38:40 -07:00
Jeff Sharkey
11744d1536 Add longpress support to keyevent. 
Change-Id: I578cb7dd910425ce07fbe56412a4dc2e0c379e65
 2013-04-29 15:31:10 -07:00
Nick Kralevich
6d8f5b755b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
 2013-04-29 15:31:03 -07:00
Jeff Sharkey
f1301d86fb Merge commit 'b3f66877' into afdmerge 
Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24
 2013-04-29 15:29:13 -07:00
Christopher Tate
2167516634 am bd1730de: Merge "Document the \'aapt dump strings\' command" 
* commit 'bd1730dec7356e042ee885ff4a63b40f36733062':
  Document the 'aapt dump strings' command
 2013-04-29 15:19:24 -07:00
Michael Wright
b3f6687756 Merge "input: added support for multiple keyevents" 2013-04-29 22:05:44 +00:00
Diego Torres Milano
2ac9d8d0f0 input: added support for multiple keyevents 
- Multiple keyevents can now be send from the command line:

    input keyevent <key code number or name> ...

  Sometimes invoking 'input' repeatedly does not send the events fast
  enough, this change solves the problem by allowing multiple key code
  number or names be added to the command line.

Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737
 2013-04-29 22:05:24 +00:00
Christopher Tate
bd1730dec7 Merge "Document the 'aapt dump strings' command" 2013-04-29 21:34:28 +00:00
Kenny Root
d334cb13d6 am d152f7ec: Merge "Don\'t use X509CertImpl directly" 
* commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913':
  Don't use X509CertImpl directly
 2013-04-29 14:16:09 -07:00
Kenny Root
d152f7ec1a Merge "Don't use X509CertImpl directly" 2013-04-29 20:54:49 +00:00
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly 
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
 2013-04-29 13:27:39 -07:00
Matthew Xie
3424b817f6 am c5790636: Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev 
* commit 'c579063615d93ba37df0bd71d96ec3bfafc586c4':
  Donot start Bluetooth Manager Service when bluetooth hardware feature is missing
 2013-04-29 12:38:19 -07:00
Matthew Xie
c579063615 Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev 2013-04-29 19:35:28 +00:00
Zhentao Sun
460778f104 am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '906e57d8c03f887aab6a48001e9d0bdff9864365':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-29 11:51:58 -07:00
Zhentao Sun
906e57d8c0 Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 2013-04-29 18:50:18 +00:00
Jeff Sharkey
b98212925e Merge "Decorate AssetFileDescriptor with Closeable." 2013-04-29 18:24:45 +00:00
Eino-Ville Talvala
cc87e73a55 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-04-29 11:22:54 -07:00
Andy McFadden
c305745f19 Merge "Regenerate GL stubs" 2013-04-29 18:22:37 +00:00
Michael Wright
0436998b5d am ccd11e30: am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev 
* commit 'ccd11e309c00ba385c84114dea88f28017148797':
  Add DPad keys to Playpad
 2013-04-29 11:22:30 -07:00
Jeff Sharkey
32559e191f Decorate AssetFileDescriptor with Closeable. 
Change-Id: I1f5f462b781a6e8fad77337006febd9c54694c0b
 2013-04-29 11:22:20 -07:00
Ying Wang
2120f87cde am 9e69a2ce: am 03ce5b53: Fix build. 
* commit '9e69a2ced4e11f74ee979390c3f58ec4318a16c3':
  Fix build.
 2013-04-29 11:22:15 -07:00
Svetoslav
9d2fcfbf3d am 3a3f47e5: am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev 
* commit '3a3f47e53188f15a68d22392958ede741d71fa0f':
  The helper query bridge in AccessibilityServiceManager missing capability.
 2013-04-29 11:22:09 -07:00
Kenny Root
b566ebdc92 am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev 
* commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0':
  Update preloaded classes
 2013-04-29 11:22:06 -07:00
Nick Kralevich
ee4e9530e0 am 25619b2c: libdrm: fix bad strncpy / snprintf calls 
* commit '25619b2c6b3fd584affe20f34bfbf164a5ddbe7d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 11:18:59 -07:00
Nick Kralevich
25619b2c6b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221
Change-Id: If386922e907567f54e26897beffaa1cfe4777896
 2013-04-29 10:49:47 -07:00