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

103169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
07e8fc89b0 am 9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev 
* commit '9059d3775ab47b08d08ec5df1be149be52007f96':
  Nuke heavy parts of notification before archiving.
 2013-04-03 23:13:56 -07:00
Jeff Sharkey
9059d3775a Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev 2013-04-04 06:09:35 +00:00
Ying Wang
6690203c7f am 0fa30372: Fix doc build. 
* commit '0fa30372c7768692f9deef3e33655382e8a683fd':
  Fix doc build.
 2013-04-03 23:02:01 -07:00
Ying Wang
0fa30372c7 Fix doc build. 
Change-Id: I954a45866d968b0571040ba99cc93b818d02aeb5
 2013-04-03 22:57:31 -07:00
Fabrice Di Meglio
787e662c0d Fix for bug #8146846 Phone App should be mirrored for RTL languages 
- add RTL version of quickcontact badge overlay

Change-Id: I007d0dae9ceec9c42684e45a735ea6b06aa6f9a0
 2013-04-03 21:01:58 -07:00
Matthew Xie
3f84b7b17d am 26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev 
* commit '26cd4d658f5c4e99c31107cef78698c818e54577':
  Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
 2013-04-03 20:19:51 -07:00
Matthew Xie
26cd4d658f Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev 2013-04-04 03:16:40 +00:00
kmccormick
2ce80a82ed am fb9a9713: am 614c155f: am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit 'fb9a9713f44f61958c02fb8af72fd6a61d44f2e7':
  Doc update: clean up text and code snippets
 2013-04-03 18:49:14 -07:00
kmccormick
fb9a9713f4 am 614c155f: am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit '614c155fc6e4c3e83b152398df0e628d7a7f4051':
  Doc update: clean up text and code snippets
 2013-04-03 18:45:29 -07:00
kmccormick
614c155fc6 am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit 'f64ad28f6b3c56c054f938680c58b69cf7237b2c':
  Doc update: clean up text and code snippets
 2013-04-03 18:41:54 -07:00
kmccormick
f64ad28f6b am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit '15ebf622de39e1a8c7d8855f5b4ede35039a2b2b':
  Doc update: clean up text and code snippets
 2013-04-03 18:38:05 -07:00
kmccormick
15ebf622de am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit 'f614d53664b78f0fb386bbea93f4513c92786ff1':
  Doc update: clean up text and code snippets
 2013-04-03 18:35:46 -07:00
kmccormick
f614d53664 am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 
* commit 'e4922f28b4d3c1f6ff166a6e5d5849c8533562ea':
  Doc update: clean up text and code snippets
 2013-04-03 18:32:36 -07:00
kmccormick
e4922f28b4 Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 2013-04-04 01:28:53 +00:00
kmccormick
fad80f7e53 Doc update: clean up text and code snippets 
"Bug: 6942838"

Change-Id: I496cbcd4b6236b5bc8a41484890f96721ba598a0
 2013-04-03 18:26:30 -07:00
kmccormick
7279f58064 am 9b9c8957: am b2961bd6: am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs 
* commit '9b9c895774d53e14b42957c2bcd8c39ae2c79fb1':
  Doc update: typo in widget design doc
 2013-04-03 18:21:11 -07:00
Matthew Xie
33ec9840c7 Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt 
Change name of BluetoothDevice#connectGattServer to BluetoothDevice#connectGatt
Add BluetoothGatt#getDevice to retrieve device from BluetoothGatt
Add BluetoothGatt#connect() to reconnect back to the server.
Make BluetoothGatt#close() public to clean up/unregister callback
Add BluetoothDevice.getType() to return int of
bug 8529188

Change-Id: Iebd9ac68cc7a64c43972e617dd3068f66c8ea0b2
 2013-04-03 18:20:13 -07:00
kmccormick
9b9c895774 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
 2013-04-03 18:16:32 -07:00
kmccormick
b2961bd683 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
 2013-04-03 18:12:48 -07:00
kmccormick
22da6f04b3 am e10b600d: am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit 'e10b600d5da413f9633ed97aefcdbd3f949637a5':
  Doc update: unterminated code tags
 2013-04-03 18:10:40 -07:00
kmccormick
8f662f125e 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
 2013-04-03 18:08:32 -07:00
kmccormick
e10b600d5d 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
 2013-04-03 18:06:40 -07:00
kmccormick
026625ffd5 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
 2013-04-03 18:06:02 -07:00
kmccormick
72146342cb am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs 
* commit 'e40b0810d9200c3de7e75ed3d311c8697bccd0a3':
  Doc update: typo in widget design doc
 2013-04-03 18:03:31 -07:00
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
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
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