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

104114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
984f94ee4c am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit 'f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
  Doc update: unterminated code tags
 2013-04-03 18:03:00 -07:00
kmccormick
f29ca256a4 am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
  Doc update: unterminated code tags
 2013-04-03 18:00:11 -07:00
kmccormick
e40b0810d9 Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs 2013-04-04 00:59:09 +00:00
kmccormick
57b73b4a1d am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit '72da7af68a86e61281ba0af0e159fb480913ae74':
  Doc update: unterminated code tags
 2013-04-03 17:58:30 -07:00
kmccormick
68f73a15e1 Doc update: typo in widget design doc 
"Bug: 7042997"

Change-Id: I89d60c42bb846514ad6792fb4a901698128a21b6
 2013-04-03 17:57:57 -07:00
kmccormick
72da7af68a am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit 'b461a13f252e3888b8614a8f363f34731274e87e':
  Doc update: unterminated code tags
 2013-04-03 17:55:50 -07:00
kmccormick
b461a13f25 Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 2013-04-04 00:52:26 +00:00
Ben Gruver
5e20733107 resolved conflicts for merge of 2ab72e1f to master 
Change-Id: I752332dfb1a2f15bac22d3f1a457ae1ef20cf240
 2013-04-03 17:46:19 -07:00
kmccormick
43d5abbf03 Doc update: unterminated code tags 
"Bug: 7250069"

Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
 2013-04-03 17:43:44 -07:00
kmccormick
7c513867bb am c0425eec: am ea19228d: am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit 'c0425eecbd1a4182f1dce2f99af8bf4e39f376d2':
  Doc update: getString -> getInt
 2013-04-03 17:41:21 -07:00
kmccormick
c0425eecbd am ea19228d: am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit 'ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5':
  Doc update: getString -> getInt
 2013-04-03 17:37:20 -07:00
kmccormick
ea19228daa am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit '69b7a1cb9a75374867f9d13117312335f11fe593':
  Doc update: getString -> getInt
 2013-04-03 17:33:59 -07:00
kmccormick
69b7a1cb9a am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit '2456a3fa3871c45378d2ad35d986cc9fa68bb5ed':
  Doc update: getString -> getInt
 2013-04-03 17:31:38 -07:00
kmccormick
2456a3fa38 am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit '7c4b45ec0ede9b485446367ead5c54fac734c26a':
  Doc update: getString -> getInt
 2013-04-03 17:29:35 -07:00
kmccormick
7c4b45ec0e am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 
* commit '7f932e88d61b977be48e2f6157f8de64c89400d9':
  Doc update: getString -> getInt
 2013-04-03 17:26:42 -07:00
kmccormick
7f932e88d6 Merge "Doc update: getString -> getInt" into jb-mr1.1-docs 2013-04-04 00:23:30 +00:00
kmccormick
fa226b1de9 Doc update: getString -> getInt 
"Bug: 7426857"

Change-Id: I0535b38f57c21a1951f45f428ca327f2cbdcb50a
 2013-04-03 17:20:57 -07:00
Glenn Kasten
f19395db63 Fix AudioTrack.setPlaybackRate() error handling 
CTS expects that setPlaybackRate() returns an error for a static buffer
AudioTrack that has not yet had any data written to the buffer.

Bug: 8181114
Change-Id: I17ba039368468f6ccd1eec5322018bfe420c09c8
 2013-04-03 17:14:14 -07:00
Jeff Brown
6d21e404ce am 41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev 
* commit '41c076715da58990dc9b0be749bba28fc75d3b78':
  Clear mCurSender when mCurChannel is modified.
 2013-04-03 17:03:40 -07:00
Jeff Brown
41c076715d Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev 2013-04-03 23:59:56 +00:00
The Android Open Source Project
2bd80b1042 Reconcile with jb-mr2-release - do not merge 
Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d
 2013-04-03 16:43:20 -07:00
Ben Gruver
2ab72e1f1a am 8c3ee9d5: Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev 
* commit '8c3ee9d50aadb0140e36000b2217f2070404b07c':
  Initial implementation of IntentFirewall functionality
 2013-04-03 16:39:59 -07:00
Ben Gruver
8c3ee9d50a Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev 2013-04-03 23:36:22 +00:00
Jeff Sharkey
5c1994eeff am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev 
* commit '04e740a65e2399c4a4b211408bd84f2d545d9f4a':
  Warn when exposing file:// Uris beyond a process.
 2013-04-03 16:33:52 -07:00
Nick Kralevich
997af33eb1 am 26bb9c95: am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev 
* commit '26bb9c955158893f946bed727124d3dbd3cfd0a7':
  Grant optional permissions by default for system apps.
 2013-04-03 16:33:49 -07:00
Nick Kralevich
1bcc3d691f aapt: add support for optional uses-permission 
Applications can request a permission with android:required="false".
For example:

<uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />

Make aapt understand such permissions.

Bug: 8522021
Change-Id: I7d3af64e7c3eca608316d5bea19c4ea639dd2b7a
 2013-04-03 16:32:40 -07:00
Jeff Sharkey
04e740a65e am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev 
* commit '0f8e8b03ebb35040c299079adc1c351f37ce4885':
  Warn when exposing file:// Uris beyond a process.
 2013-04-03 16:29:55 -07:00
Nick Kralevich
26bb9c9551 am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev 
* commit '0d17aaa543f393c6c792f0b0d8ec5cb38ff1f71e':
  Grant optional permissions by default for system apps.
 2013-04-03 16:29:53 -07:00
Jeff Sharkey
0f8e8b03eb Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev 2013-04-03 23:28:07 +00:00
Nick Kralevich
0d17aaa543 Merge "Grant optional permissions by default for system apps." into jb-mr2-dev 2013-04-03 23:26:28 +00:00
Raph Levien
e68d87e092 Update Roboto to version 1.200311 
This updates Roboto to the latest version. This change should fix a
number of problems, including bug 7306377 (vietnamese o with horn), bug
6679075 (vietnamese u+1ee1), bug 7568194 (cyrillic yeru), and is also on
the critical path of bug 7291977 (t comma accent), bug 8278292 (E
ogonek) and likely others.

Change-Id: Ife3db2aec4784a54cfe0287b61eac8339c198c71
 2013-04-03 16:26:12 -07:00
Nick Kralevich
60792852c8 Grant optional permissions by default for system apps. 
For pre-installed system apps, automatically grant all optional
permissions.

Change-Id: I99bb320a0bbaa9873baeb63655556fe0fae6f011
 2013-04-03 16:17:06 -07:00
Jean-Baptiste Queru
40a534bd87 am aaa46cfa: resolved conflicts for merge of 9ce89835 to jb-mr2-dev-plus-aosp 
* commit 'aaa46cfa3d3956b726c231d51092720e78e6e1a7':
  Update list of all audio files.
 2013-04-03 16:15:57 -07:00
Jean-Baptiste Queru
aaa46cfa3d resolved conflicts for merge of 9ce89835 to jb-mr2-dev-plus-aosp 
Change-Id: Iabb769874d61fdb12d70d69518930dc81b7633b3
 2013-04-03 16:00:44 -07:00
kmccormick
03dcece6a6 am 87b30e8e: am f81e4b47: am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '87b30e8e04b4c73efd27c5a261b4d8fcdccb3052':
  Doc update: it's -> its
 2013-04-03 15:37:57 -07:00
Jean-Baptiste Queru
9ce89835da Update list of all audio files. 
This adds a script that can generate the list from the other
makefiles.

This also regenerates the list.

Bug: 6336895
Change-Id: If1546c4a3f5b1f0d7c3ca79d29383e9843b2a89d
 2013-04-03 15:36:52 -07:00
kmccormick
87b30e8e04 am f81e4b47: am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit 'f81e4b4745c8fc8184fa84e3ce8ed66b92b61f49':
  Doc update: it's -> its
 2013-04-03 15:34:24 -07:00
kmccormick
f81e4b4745 am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '43644aa1ead4e5219cff8a81f0818265b2b1eb28':
  Doc update: it's -> its
 2013-04-03 15:31:00 -07:00
kmccormick
43644aa1ea am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '23af4fffba3c9638d3fb7ffbaa50b09b510fd568':
  Doc update: it's -> its
 2013-04-03 15:28:04 -07:00
Jean-Baptiste Queru
ffa69dc2d0 am 568a954e: am 5e98dfee: Merge "Update list of all audio files." 
* commit '568a954e27a2f7cb8427f3ead4bff29e7b2c6874':
  Update list of all audio files.
 2013-04-03 15:28:01 -07:00
Jean-Baptiste Queru
568a954e27 am 5e98dfee: Merge "Update list of all audio files." 
* commit '5e98dfee848795a47d59455a7da35e04b48b1900':
  Update list of all audio files.
 2013-04-03 15:25:44 -07:00
kmccormick
23af4fffba am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '3f000e58af4d8da4fd62feab28424a8eac9434ec':
  Doc update: it's -> its
 2013-04-03 15:24:53 -07:00
kmccormick
3f000e58af am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '82c01b09c8b0db759a3271e5b20e1a565491e3b7':
  Doc update: it's -> its
 2013-04-03 15:22:02 -07:00
kmccormick
82c01b09c8 am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs 
* commit '28cb20241bd3a31957cb034dc586eadee002ffbc':
  Doc update: it's -> its
 2013-04-03 15:18:54 -07:00
Jean-Baptiste Queru
5e98dfee84 Merge "Update list of all audio files." 2013-04-03 22:15:10 +00:00
kmccormick
28cb20241b Merge "Doc update: it's -> its" into jb-mr1.1-docs 2013-04-03 22:14:30 +00:00
kmccormick
b9dceb8582 Doc update: it's -> its 
"Bug: 7738685"

Change-Id: I70b1354afeb5fc7a5801d3ad22866f21ae25c1ae
 2013-04-03 15:11:53 -07:00
Matthew Xie
be96b634dd am afa72ed8: am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev 
* commit 'afa72ed8b8be8652303dedbf8f1c114ef9903071':
  Fix minor LE descriptor permissions issue
 2013-04-03 15:08:29 -07:00
kmccormick
c5c6cc2da1 am 8d58f213: am 205d380b: am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '8d58f213d337c20e782738bda021e1076973b68d':
  Doc update: add links to maps docs
 2013-04-03 15:08:25 -07:00
kmccormick
b471da283e am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
  Doc update: fix broken code sample
 2013-04-03 15:03:53 -07:00