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

102538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
41c076715d Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev 2013-04-03 23:59:56 +00:00
Ben Gruver
8c3ee9d50a Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev 2013-04-03 23:36:22 +00: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
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
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
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
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
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
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
599efc3aa3 Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev 2013-04-03 22:00:07 +00:00
kmccormick
205d380bdc am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '9da4bde42329fe6c03d2eb4617f91892002e4460':
  Doc update: add links to maps docs
 2013-04-03 14:59:12 -07:00
kmccormick
9da4bde423 am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f':
  Doc update: add links to maps docs
 2013-04-03 14:54:32 -07:00
Andre Eisenbach
6f0ed128e4 Fix minor LE descriptor permissions issue 
Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24
 2013-04-03 14:54:12 -07:00
kmccormick
4b846e0d81 am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '322ba0d403ca063c1374d48c5a6717a585052abf':
  Doc update: add links to maps docs
 2013-04-03 14:50:32 -07:00
kmccormick
322ba0d403 am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit 'a0907a1278c7ce568baabb3a4b1e2e9f83e18a09':
  Doc update: add links to maps docs
 2013-04-03 14:47:14 -07:00
kmccormick
a0907a1278 am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit 'edbe6e134846d2a01378497dca42b47be7e7292b':
  Doc update: add links to maps docs
 2013-04-03 14:43:37 -07:00
Jeff Brown
4d656885ed Clear mCurSender when mCurChannel is modified. 
This fixed an issue where an InputEventSender might outlive
its usefulness and continue to be used well after it should
have been disposed or recreated.

Also improves the queue management somewhat.

Bug: 8493879
Change-Id: I7e0b6a3c43cbe72f8762991f5d36560feebd214b
 2013-04-03 14:40:57 -07:00
kmccormick
edbe6e1348 Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 2013-04-03 21:39:43 +00:00
kmccormick
d056e62b19 Doc update: add links to maps docs 
"Bug: 8090710"

Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4
 2013-04-03 14:30:31 -07:00
kmccormick
bbcf0852f7 am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
  Doc update: fix broken code sample
 2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
  Doc update: fix broken code sample
 2013-04-03 14:26:34 -07:00
kmccormick
f57266175d am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
  Doc update: fix broken code sample
 2013-04-03 14:23:54 -07:00
kmccormick
2144eee357 am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
  Doc update: fix broken code sample
 2013-04-03 14:21:10 -07:00
kmccormick
3fb5536d62 am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '91e01a4d2ee09a1a6a226302cd6d524a1c96070f':
  Doc update: fix broken code sample
 2013-04-03 14:18:56 -07:00
kmccormick
91e01a4d2e Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 2013-04-03 21:16:08 +00:00
kmccormick
e4ce502d77 Doc update: fix broken code sample 
"Bug: 8537853"

Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
 2013-04-03 14:13:36 -07:00
Jean-Michel Trivi
6a5702041f Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 2013-04-03 21:11:12 +00:00
kmccormick
4d88259f62 am fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit 'fa387c518274b91d770fb1b7285d6a123321ef9b':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 14:01:53 -07:00
kmccormick
fa387c5182 am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '73c8a7a8200aab208abacc42a6fcbce5d3dbc1b0':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:54:16 -07:00
kmccormick
73c8a7a820 am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '3789fa0f6becc09055d454808fe617754b5ef1c7':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:51:49 -07:00
kmccormick
3789fa0f6b am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8acb7166b3cbf00e6972393bc929ef7cc54c7108':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:49:33 -07:00
kmccormick
8acb7166b3 am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8b5e342b0e24b9bb546456209d9d27480fa233e8':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:47:42 -07:00
Chris Craik
ff7ae2dccd Merge "Correct save/restore match up" into jb-mr2-dev 2013-04-03 20:31:49 +00:00
Kenny Root
75827d4a31 Merge "Add direct API to get ManifestDigest" into jb-mr2-dev 2013-04-03 20:27:43 +00:00
Jeff Sharkey
0c1baf9dd6 Nuke heavy parts of notification before archiving. 
Bug: 8537938
Change-Id: I2e4eccc3bd6d57fe5cef340d9e67986d78d3be95
 2013-04-03 13:08:52 -07:00
kmccormick
8b5e342b0e Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 2013-04-03 20:07:53 +00:00
kmccormick
76dfc02135 Doc update: clean up ubiquitous typo "the the" 
"Bug: 8531405"

Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be
 2013-04-03 13:04:06 -07:00
Chris Craik
e0b39fc18c Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 2013-04-03 19:43:47 +00:00
Chris Craik
1ed30c907f Correct save/restore match up 
bug:8480642

With the additional save/restore around the operations in flush, the
stored restore batches weren't matching up to the correct saves.

Change-Id: I2f48f19009bd97289b6973283f43dc8d3e35affd
 2013-04-03 12:37:35 -07:00
Baligh Uddin
bc9da0f4b5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-03 19:28:17 +00:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app 
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
 2013-04-03 12:01:59 -07:00