OSDN Git Service

android-x86/frameworks-base.git
11 years agoam b2961bd6: am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update...
kmccormick [Thu, 4 Apr 2013 01:16:32 +0000 (18:16 -0700)]
am b2961bd6: am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

* commit 'b2961bd6833697baac52888765fe8518133f489e':
  Doc update: typo in widget design doc

11 years agoam 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget...
kmccormick [Thu, 4 Apr 2013 01:12:48 +0000 (18:12 -0700)]
am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

* commit '8f662f125edf393943fa7cceaf4758aae0534841':
  Doc update: typo in widget design doc

11 years agoam 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc...
kmccormick [Thu, 4 Apr 2013 01:08:32 +0000 (18:08 -0700)]
am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

* commit '026625ffd5f256997f5bda87d39afe10152f5a9e':
  Doc update: typo in widget design doc

11 years agoam 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update...
kmccormick [Thu, 4 Apr 2013 01:06:40 +0000 (18:06 -0700)]
am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

* commit '984f94ee4c4ef0196d9b2c149d0a42f20b72bebf':
  Doc update: unterminated code tags

11 years agoam 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1...
kmccormick [Thu, 4 Apr 2013 01:06:02 +0000 (18:06 -0700)]
am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

* commit '72146342cbe9ac1e1efffe90fa64d7f4026cf359':
  Doc update: typo in widget design doc

11 years agoam e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 01:03:31 +0000 (18:03 -0700)]
am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

* commit 'e40b0810d9200c3de7e75ed3d311c8697bccd0a3':
  Doc update: typo in widget design doc

11 years agoam f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated...
kmccormick [Thu, 4 Apr 2013 01:03:00 +0000 (18:03 -0700)]
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

11 years agoam 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags...
kmccormick [Thu, 4 Apr 2013 01:00:11 +0000 (18:00 -0700)]
am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
  Doc update: unterminated code tags

11 years agoMerge "Doc update: typo in widget design doc" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:59:08 +0000 (00:59 +0000)]
Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs

11 years agoam 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1...
kmccormick [Thu, 4 Apr 2013 00:58:30 +0000 (17:58 -0700)]
am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

* commit '72da7af68a86e61281ba0af0e159fb480913ae74':
  Doc update: unterminated code tags

11 years agoDoc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 00:56:58 +0000 (17:56 -0700)]
Doc update: typo in widget design doc

"Bug: 7042997"

Change-Id: I89d60c42bb846514ad6792fb4a901698128a21b6

11 years agoam b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:55:50 +0000 (17:55 -0700)]
am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

* commit 'b461a13f252e3888b8614a8f363f34731274e87e':
  Doc update: unterminated code tags

11 years agoMerge "Doc update: unterminated code tags" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:52:26 +0000 (00:52 +0000)]
Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

11 years agoDoc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 00:28:14 +0000 (17:28 -0700)]
Doc update: unterminated code tags

"Bug: 7250069"

Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d

11 years agoam ea19228d: am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update...
kmccormick [Thu, 4 Apr 2013 00:37:20 +0000 (17:37 -0700)]
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

11 years agoam 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString...
kmccormick [Thu, 4 Apr 2013 00:33:59 +0000 (17:33 -0700)]
am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

* commit '69b7a1cb9a75374867f9d13117312335f11fe593':
  Doc update: getString -> getInt

11 years agoam 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into...
kmccormick [Thu, 4 Apr 2013 00:31:38 +0000 (17:31 -0700)]
am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

* commit '2456a3fa3871c45378d2ad35d986cc9fa68bb5ed':
  Doc update: getString -> getInt

11 years agoam 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:29:35 +0000 (17:29 -0700)]
am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

* commit '7c4b45ec0ede9b485446367ead5c54fac734c26a':
  Doc update: getString -> getInt

11 years agoam 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:26:42 +0000 (17:26 -0700)]
am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

* commit '7f932e88d61b977be48e2f6157f8de64c89400d9':
  Doc update: getString -> getInt

11 years agoMerge "Doc update: getString -> getInt" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:23:30 +0000 (00:23 +0000)]
Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

11 years agoDoc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:19:50 +0000 (17:19 -0700)]
Doc update: getString -> getInt

"Bug: 7426857"

Change-Id: I0535b38f57c21a1951f45f428ca327f2cbdcb50a

11 years agoMerge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
Jeff Brown [Wed, 3 Apr 2013 23:59:55 +0000 (23:59 +0000)]
Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev

11 years agoMerge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev
Ben Gruver [Wed, 3 Apr 2013 23:36:22 +0000 (23:36 +0000)]
Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev

11 years agoMerge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
Jeff Sharkey [Wed, 3 Apr 2013 23:28:07 +0000 (23:28 +0000)]
Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev

11 years agoMerge "Grant optional permissions by default for system apps." into jb-mr2-dev
Nick Kralevich [Wed, 3 Apr 2013 23:26:28 +0000 (23:26 +0000)]
Merge "Grant optional permissions by default for system apps." into jb-mr2-dev

11 years agoGrant optional permissions by default for system apps.
Nick Kralevich [Wed, 3 Apr 2013 21:12:24 +0000 (14:12 -0700)]
Grant optional permissions by default for system apps.

For pre-installed system apps, automatically grant all optional
permissions.

Change-Id: I99bb320a0bbaa9873baeb63655556fe0fae6f011

11 years agoUpdate list of all audio files.
Jean-Baptiste Queru [Wed, 3 Apr 2013 21:42:47 +0000 (14:42 -0700)]
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

11 years agoam 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update...
kmccormick [Wed, 3 Apr 2013 22:31:00 +0000 (15:31 -0700)]
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

11 years agoam 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its...
kmccormick [Wed, 3 Apr 2013 22:28:04 +0000 (15:28 -0700)]
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

11 years agoam 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1...
kmccormick [Wed, 3 Apr 2013 22:24:53 +0000 (15:24 -0700)]
am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs

* commit '3f000e58af4d8da4fd62feab28424a8eac9434ec':
  Doc update: it's -> its

11 years agoam 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 22:22:02 +0000 (15:22 -0700)]
am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs

* commit '82c01b09c8b0db759a3271e5b20e1a565491e3b7':
  Doc update: it's -> its

11 years agoam 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 22:18:54 +0000 (15:18 -0700)]
am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs

* commit '28cb20241bd3a31957cb034dc586eadee002ffbc':
  Doc update: it's -> its

11 years agoMerge "Doc update: it's -> its" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 22:14:30 +0000 (22:14 +0000)]
Merge "Doc update: it's -> its" into jb-mr1.1-docs

11 years agoDoc update: it's -> its
kmccormick [Wed, 3 Apr 2013 22:11:15 +0000 (15:11 -0700)]
Doc update: it's -> its

"Bug: 7738685"

Change-Id: I70b1354afeb5fc7a5801d3ad22866f21ae25c1ae

11 years agoMerge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
Matthew Xie [Wed, 3 Apr 2013 21:58:33 +0000 (21:58 +0000)]
Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev

11 years agoam 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update...
kmccormick [Wed, 3 Apr 2013 21:59:12 +0000 (14:59 -0700)]
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

11 years agoam 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links...
kmccormick [Wed, 3 Apr 2013 21:54:32 +0000 (14:54 -0700)]
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

11 years agoFix minor LE descriptor permissions issue
Andre Eisenbach [Wed, 3 Apr 2013 21:26:43 +0000 (14:26 -0700)]
Fix minor LE descriptor permissions issue

Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24

11 years agoam 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs...
kmccormick [Wed, 3 Apr 2013 21:50:32 +0000 (14:50 -0700)]
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

11 years agoam a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1...
kmccormick [Wed, 3 Apr 2013 21:47:14 +0000 (14:47 -0700)]
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

11 years agoam edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:43:37 +0000 (14:43 -0700)]
am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs

* commit 'edbe6e134846d2a01378497dca42b47be7e7292b':
  Doc update: add links to maps docs

11 years agoClear mCurSender when mCurChannel is modified.
Jeff Brown [Wed, 3 Apr 2013 21:39:19 +0000 (14:39 -0700)]
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

11 years agoMerge "Doc update: add links to maps docs" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:39:43 +0000 (21:39 +0000)]
Merge "Doc update: add links to maps docs" into jb-mr1.1-docs

11 years agoDoc update: add links to maps docs
kmccormick [Wed, 3 Apr 2013 21:26:18 +0000 (14:26 -0700)]
Doc update: add links to maps docs

"Bug: 8090710"

Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4

11 years agoam 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update...
kmccormick [Wed, 3 Apr 2013 21:30:09 +0000 (14:30 -0700)]
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

11 years agoam f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken...
kmccormick [Wed, 3 Apr 2013 21:26:34 +0000 (14:26 -0700)]
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

11 years agoam 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample...
kmccormick [Wed, 3 Apr 2013 21:23:54 +0000 (14:23 -0700)]
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

11 years agoam 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1...
kmccormick [Wed, 3 Apr 2013 21:21:10 +0000 (14:21 -0700)]
am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs

* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
  Doc update: fix broken code sample

11 years agoam 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:18:56 +0000 (14:18 -0700)]
am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs

* commit '91e01a4d2ee09a1a6a226302cd6d524a1c96070f':
  Doc update: fix broken code sample

11 years agoMerge "Doc update: fix broken code sample" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:16:08 +0000 (21:16 +0000)]
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs

11 years agoDoc update: fix broken code sample
kmccormick [Wed, 3 Apr 2013 21:00:19 +0000 (14:00 -0700)]
Doc update: fix broken code sample

"Bug: 8537853"

Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee

11 years agoMerge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
Jean-Michel Trivi [Wed, 3 Apr 2013 21:11:12 +0000 (21:11 +0000)]
Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev

11 years agoam fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update...
kmccormick [Wed, 3 Apr 2013 21:01:53 +0000 (14:01 -0700)]
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"

11 years agoam 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiqu...
kmccormick [Wed, 3 Apr 2013 20:54:16 +0000 (13:54 -0700)]
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"

11 years agoam 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo...
kmccormick [Wed, 3 Apr 2013 20:51:49 +0000 (13:51 -0700)]
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"

11 years agoam 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the""...
kmccormick [Wed, 3 Apr 2013 20:49:33 +0000 (13:49 -0700)]
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"

11 years agoam 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1...
kmccormick [Wed, 3 Apr 2013 20:47:42 +0000 (13:47 -0700)]
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"

11 years agoMerge "Correct save/restore match up" into jb-mr2-dev
Chris Craik [Wed, 3 Apr 2013 20:31:49 +0000 (20:31 +0000)]
Merge "Correct save/restore match up" into jb-mr2-dev

11 years agoMerge "Add direct API to get ManifestDigest" into jb-mr2-dev
Kenny Root [Wed, 3 Apr 2013 20:27:42 +0000 (20:27 +0000)]
Merge "Add direct API to get ManifestDigest" into jb-mr2-dev

11 years agoMerge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 20:07:52 +0000 (20:07 +0000)]
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs

11 years agoDoc update: clean up ubiquitous typo "the the"
kmccormick [Wed, 3 Apr 2013 19:41:12 +0000 (12:41 -0700)]
Doc update: clean up ubiquitous typo "the the"

"Bug: 8531405"

Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be

11 years agoMerge "Account for hairlines in quick rejection logic" into jb-mr2-dev
Chris Craik [Wed, 3 Apr 2013 19:43:46 +0000 (19:43 +0000)]
Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev

11 years agoCorrect save/restore match up
Chris Craik [Wed, 3 Apr 2013 19:37:35 +0000 (12:37 -0700)]
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 19:28:17 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoWarn when exposing file:// Uris beyond a process.
Jeff Sharkey [Wed, 3 Apr 2013 01:27:45 +0000 (18:27 -0700)]
Warn when exposing file:// Uris beyond a process.

Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.

Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.

Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef

11 years agoRemove keystore entries when package removed
Kenny Root [Mon, 1 Apr 2013 22:59:59 +0000 (15:59 -0700)]
Remove keystore entries when package removed

Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

(cherry picked from commit 95e3ee3971915b323e5c13dcfe3b12a4180850cd)

Bug: 3020069
Change-Id: I374258ccc103f8cb3e238f2bf0d1afda0659db94

11 years agoAccount for hairlines in quick rejection logic
Chris Craik [Wed, 3 Apr 2013 16:55:48 +0000 (09:55 -0700)]
Account for hairlines in quick rejection logic

bug:8531373
Change-Id: I35444014f23fc61da687694fccc0d13bce718793

11 years agoam 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge...
Scott Kennedy [Wed, 3 Apr 2013 16:38:49 +0000 (09:38 -0700)]
am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit '23eda7cd0a2b80bafcba7c24f49a73a2f11f782f':
  docs: Typos and other fixes

11 years agoam 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos...
Scott Kennedy [Wed, 3 Apr 2013 16:35:18 +0000 (09:35 -0700)]
am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
  docs: Typos and other fixes

11 years agoam c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other...
Scott Kennedy [Wed, 3 Apr 2013 16:31:32 +0000 (09:31 -0700)]
am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
  docs: Typos and other fixes

11 years agoam 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb...
Scott Kennedy [Wed, 3 Apr 2013 16:27:46 +0000 (09:27 -0700)]
am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit '2dd01a0b5b08a0ccd7b2932707ce58dd959ac3f8':
  docs: Typos and other fixes

11 years agoam 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
Scott Kennedy [Wed, 3 Apr 2013 16:24:42 +0000 (09:24 -0700)]
am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit '555c82cd43ef8d11bcf54f023864619869c06411':
  docs: Typos and other fixes

11 years agoam f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
Scott Kennedy [Wed, 3 Apr 2013 16:20:38 +0000 (09:20 -0700)]
am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
  docs: Typos and other fixes

11 years agoMerge "docs: Typos and other fixes" into jb-mr1-dev
Scott Kennedy [Wed, 3 Apr 2013 16:16:35 +0000 (16:16 +0000)]
Merge "docs: Typos and other fixes" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 16:02:22 +0000 (09:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75964c44ea483a91bc9e4be7433055be4cca57cf
Auto-generated-cl: translation import

11 years agoMerge "Fix LinkProperties's equals() method." into jb-mr2-dev
Lorenzo Colitti [Wed, 3 Apr 2013 05:28:49 +0000 (05:28 +0000)]
Merge "Fix LinkProperties's equals() method." into jb-mr2-dev

11 years agoInitial implementation of IntentFirewall functionality
Ben Gruver [Wed, 3 Apr 2013 04:18:41 +0000 (21:18 -0700)]
Initial implementation of IntentFirewall functionality

This has the full filter functionality, but is currently only
able to block Activity intents. Logging intents, or blocking
service/broadcast intents is not yet implemented.

Change-Id: Ied3d8dedf982e17bcbdff3e328eeb87477954df7

11 years agoFix reference cycle in InputEventReceiver and Sender.
Jeff Brown [Wed, 3 Apr 2013 01:01:38 +0000 (18:01 -0700)]
Fix reference cycle in InputEventReceiver and Sender.

If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.

Switched to using a weak reference.

Also updated Binder to use a new helper created for this purpose.

Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da

11 years agoMerge "Add global key configuration file" into jb-mr2-dev
Justin Koh [Wed, 3 Apr 2013 01:11:53 +0000 (01:11 +0000)]
Merge "Add global key configuration file" into jb-mr2-dev

11 years agoAdd global key configuration file
Justin Koh [Mon, 1 Apr 2013 19:18:26 +0000 (12:18 -0700)]
Add global key configuration file

Add global key configuration file. A global key is one that is handled by
PhoneWindowManager before dispatching and sent to a given component via
broadcast instead of going to the foreground app.
Bug: 8510681

Change-Id: Ic6a8e559680d005613ed22874b27eb78bbfc4499

11 years agoMerge "Change time format for default clock in keyguard" into jb-mr2-dev
Jim Miller [Wed, 3 Apr 2013 00:24:51 +0000 (00:24 +0000)]
Merge "Change time format for default clock in keyguard" into jb-mr2-dev

11 years agoam 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update...
kmccormick [Tue, 2 Apr 2013 23:54:52 +0000 (16:54 -0700)]
am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit '7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb':
  Doc update: Misc doc bugs

11 years agoam 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs...
kmccormick [Tue, 2 Apr 2013 23:51:06 +0000 (16:51 -0700)]
am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit '70e99bfe409b5cb116bf3f0512e3d05c13240eea':
  Doc update: Misc doc bugs

11 years agoam b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb...
kmccormick [Tue, 2 Apr 2013 23:48:16 +0000 (16:48 -0700)]
am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit 'b50f24066a559268fc39319cdf3af273146a0d5f':
  Doc update: Misc doc bugs

11 years agoam 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
kmccormick [Tue, 2 Apr 2013 23:44:24 +0000 (16:44 -0700)]
am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit '050f661173979b95e52f5020c8dd8adc09e8badd':
  Doc update: Misc doc bugs

11 years agoam 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
kmccormick [Tue, 2 Apr 2013 23:41:41 +0000 (16:41 -0700)]
am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit '78e5d1834ea1271b17410962f6640deb04a59300':
  Doc update: Misc doc bugs

11 years agoMerge "Doc update: Misc doc bugs" into jb-mr1.1-docs
kmccormick [Tue, 2 Apr 2013 23:26:30 +0000 (23:26 +0000)]
Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

11 years agoDoc update: Misc doc bugs
kmccormick [Tue, 2 Apr 2013 01:08:28 +0000 (18:08 -0700)]
Doc update: Misc doc bugs

"Bug: 6515524"

Change-Id: I1c8334e22637e9b55377a8743178bd5aa34ee9cd

11 years agoChange time format for default clock in keyguard
Jim Miller [Tue, 2 Apr 2013 23:03:02 +0000 (16:03 -0700)]
Change time format for default clock in keyguard

This changes the default clock format from "kk:mm" to "HH:mm"

Fixes bug 8447801

Change-Id: I25f0c406dbecba8288773c9d13d0092485274af5

11 years agoMerge "MediaDrm API update" into jb-mr2-dev
Jeff Tinker [Tue, 2 Apr 2013 22:49:19 +0000 (22:49 +0000)]
Merge "MediaDrm API update" into jb-mr2-dev

11 years agoAdd direct API to get ManifestDigest
Kenny Root [Tue, 2 Apr 2013 21:04:24 +0000 (14:04 -0700)]
Add direct API to get ManifestDigest

This makes it faster for applications that don't want to collect all the
certificates but do want the AndroidManifest.xml digest.

Bug: 8528639
Change-Id: Ide9498d0981188960af194a9568387337c075bcc

11 years agoMerge "Lock when obtaining the current monitor name." into jb-mr2-dev
Michael Wright [Tue, 2 Apr 2013 21:01:27 +0000 (21:01 +0000)]
Merge "Lock when obtaining the current monitor name." into jb-mr2-dev

11 years agoam 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards...
Scott Main [Tue, 2 Apr 2013 20:59:18 +0000 (13:59 -0700)]
am 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.

* commit '7d2301965621ccd10b0ab7afba37fffcc566b05a':
  update dashboards for 4/1. Now charts are generated from JSON data.

11 years agoam 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now...
Scott Main [Tue, 2 Apr 2013 20:55:12 +0000 (13:55 -0700)]
am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.

* commit '065cdf93a08eb65239f37b3837ca95f31fddad8b':
  update dashboards for 4/1. Now charts are generated from JSON data.

11 years agoam be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are...
Scott Main [Tue, 2 Apr 2013 20:53:01 +0000 (13:53 -0700)]
am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.

* commit 'be71cf4e21a2cbb95cf6475b89d064d8a571181b':
  update dashboards for 4/1. Now charts are generated from JSON data.

11 years agoam 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from...
Scott Main [Tue, 2 Apr 2013 20:51:00 +0000 (13:51 -0700)]
am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.

* commit '5fd986bcb38dabfa8e79d026d4d3f287ae975f3b':
  update dashboards for 4/1. Now charts are generated from JSON data.

11 years agoam 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
Scott Main [Tue, 2 Apr 2013 20:47:54 +0000 (13:47 -0700)]
am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.

* commit '3cd0b46ca4a4ab5ec597fe42f8637d0df5d83e5a':
  update dashboards for 4/1. Now charts are generated from JSON data.

11 years agoupdate dashboards for 4/1.
Scott Main [Thu, 28 Feb 2013 01:51:49 +0000 (17:51 -0800)]
update dashboards for 4/1.
Now charts are generated from JSON data.

Change-Id: I17180b993a9ba50daf8a269ad26093079fd1da65

11 years agoMerge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
Brian Colonna [Tue, 2 Apr 2013 20:19:23 +0000 (20:19 +0000)]
Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev

11 years agoMerge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev
Nick Kralevich [Tue, 2 Apr 2013 19:44:02 +0000 (19:44 +0000)]
Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev