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

103376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
428a66b7b0 am 5efd8942: am dac3fd9d: Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev 
* commit '5efd89423eb3937b9ab45935fc2c9c5ddb8671e2':
  audio service: fix BT SCO intent permission again
 2013-03-28 16:35:59 -07:00
Eric Laurent
5efd89423e am dac3fd9d: Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev 
* commit 'dac3fd9d90daffb4f6b08c788184ff38523348ba':
  audio service: fix BT SCO intent permission again
 2013-03-28 16:33:46 -07:00
kmccormick
93baebfb45 am 0aeb824b: am af7c60be: am a25c43f5: am 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit '0aeb824b4a688ba74015e53b5bf975d66e3b8137':
  Doc update: fix incorrect enum
 2013-03-28 16:32:23 -07:00
kmccormick
0aeb824b4a am af7c60be: am a25c43f5: am 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit 'af7c60be4d18381bfd70b079f1c57480b0c3aea8':
  Doc update: fix incorrect enum
 2013-03-28 16:30:13 -07:00
Eric Laurent
dac3fd9d90 Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev 2013-03-28 23:28:02 +00:00
kmccormick
af7c60be4d am a25c43f5: am 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit 'a25c43f5545c7d9b7e94f2bb10d64ed7d7302b49':
  Doc update: fix incorrect enum
 2013-03-28 16:27:23 -07:00
kmccormick
a25c43f554 am 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit '3121868cb860eb47182fcbae5d55667af51afb5a':
  Doc update: fix incorrect enum
 2013-03-28 16:24:25 -07:00
kmccormick
3121868cb8 am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit '38e94e9f820ffd9eeda8ccb92ee77183cc870dde':
  Doc update: fix incorrect enum
 2013-03-28 16:22:29 -07:00
kmccormick
38e94e9f82 am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum 
* commit '4d0beb7e54ed37cf9e854b793983046478233fdf':
  Doc update: fix incorrect enum
 2013-03-28 16:19:37 -07:00
kmccormick
4d0beb7e54 am 4f414b79: Doc update: fix incorrect enum 
* commit '4f414b7949a969c1e1cb0597155bca1d3aa2c455':
  Doc update: fix incorrect enum
 2013-03-28 16:17:23 -07:00
kmccormick
4f414b7949 Doc update: fix incorrect enum 
"Bug: 4980236"

Change-Id: I39f8f429574a9916c5fffc5b2e4ec4715ec48803
 2013-03-28 16:14:08 -07:00
Eric Laurent
6b5e22d52c audio service: fix BT SCO intent permission again 
Commit 2a57ca93 did not address the calling permission
for setMode() method which can also indirectly call
BluetoothHeadset APIs.

Bug 8242429

Change-Id: I8483c0492836192f47984c48629291cb261b001b
 2013-03-28 16:10:45 -07:00
Matthew Xie
3f9560261f am e4eb23ec: am 84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev 
* commit 'e4eb23ecc232c508974976844df2ea8c44025fe9':
  Unhide Bluetooth Low Energy public APIs
 2013-03-28 16:10:03 -07:00
Matthew Xie
e4eb23ecc2 am 84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev 
* commit '84e594f7dbe6108a2c6c57d5d9d941d0b0563b4b':
  Unhide Bluetooth Low Energy public APIs
 2013-03-28 16:07:18 -07:00
Matthew Xie
84e594f7db Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev 2013-03-28 23:04:48 +00:00
kmccormick
adf7fa3d28 am ce2db15d: am 80ab68ce: am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit 'ce2db15d702dd4a27f860214ae2bfcf2693ee683':
  Doc update: superceeded > superseded
 2013-03-28 15:39:27 -07:00
Matthew Xie
ddf7e4756c Unhide Bluetooth Low Energy public APIs 
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug 8450158

Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
 2013-03-28 15:36:10 -07:00
kmccormick
ce2db15d70 am 80ab68ce: am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '80ab68ce233598ab13a9875fe17d4ec51aa5517b':
  Doc update: superceeded > superseded
 2013-03-28 15:34:38 -07:00
kmccormick
80ab68ce23 am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '5c3ddcd14b79c4737ea06f68d8efd39543d60382':
  Doc update: superceeded > superseded
 2013-03-28 15:30:46 -07:00
kmccormick
5c3ddcd14b am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '425c3d5f59f1e315cdbdd5f7530c4380aabf76ab':
  Doc update: superceeded > superseded
 2013-03-28 15:27:54 -07:00
kmccormick
425c3d5f59 am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '99049335a604cae3f515fce32bc5f1b27fe8d29b':
  Doc update: superceeded > superseded
 2013-03-28 15:26:25 -07:00
kmccormick
99049335a6 am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '3ed65cb3496afe90d82bfadbff4d2687189ae47d':
  Doc update: superceeded > superseded
 2013-03-28 15:24:39 -07:00
kmccormick
3ed65cb349 am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '689e827aa3fa69d20087972dfb93ed257e4d109b':
  Doc update: superceeded > superseded
 2013-03-28 15:23:08 -07:00
kmccormick
689e827aa3 Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 2013-03-28 22:21:12 +00:00
kmccormick
ac66b85a04 Doc update: superceeded > superseded 
"Bug: 5935672"

Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
 2013-03-28 15:19:06 -07:00
Eric Laurent
e2869125f1 am b02e254d: am 7692d1f1: Merge "Display vibrate icon in volume panel" into jb-mr2-dev 
* commit 'b02e254d45af260b9e9c11bff7cb1db427e77ace':
  Display vibrate icon in volume panel
 2013-03-28 15:13:02 -07:00
Eric Laurent
b02e254d45 am 7692d1f1: Merge "Display vibrate icon in volume panel" into jb-mr2-dev 
* commit '7692d1f1654975ef0ef59e6b8dc881299194babf':
  Display vibrate icon in volume panel
 2013-03-28 15:10:03 -07:00
Eric Laurent
7692d1f165 Merge "Display vibrate icon in volume panel" into jb-mr2-dev 2013-03-28 22:08:05 +00:00
Kenny Root
4cd3f247f7 am ae026596: am e861f4a3: am d4b8baf3: am 02c86306: Merge "Add ability to install credentials as other UID" 
* commit 'ae02659638ffff5eecd327a301815b77bc190577':
  Add ability to install credentials as other UID
 2013-03-28 14:33:02 -07:00
Elliott Hughes
d1e0f941d5 am 0f3a3777: am 94eaab4a: am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit '0f3a3777026c20011f1b419daf12980715e594ff':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:32:59 -07:00
Geremy Condra
565dd2c469 am 0314b976: am 5c3bd37a: am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit '0314b976654ac9f64f8bb60962b81feadcc13d20':
  Add data validation on seinfo labels.
 2013-03-28 14:32:56 -07:00
Kenny Root
ae02659638 am e861f4a3: am d4b8baf3: am 02c86306: Merge "Add ability to install credentials as other UID" 
* commit 'e861f4a3a50a41ffc372e4d7d47a5205c51f9252':
  Add ability to install credentials as other UID
 2013-03-28 14:31:15 -07:00
Elliott Hughes
0f3a377702 am 94eaab4a: am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit '94eaab4a5ddd6db4bcbc8a1e65a4d8e60d1d1274':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:31:11 -07:00
Geremy Condra
0314b97665 am 5c3bd37a: am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit '5c3bd37ab7b18bd5c3ea4bfcb86cc0a30c10d534':
  Add data validation on seinfo labels.
 2013-03-28 14:31:08 -07:00
Kenny Root
e861f4a3a5 am d4b8baf3: am 02c86306: Merge "Add ability to install credentials as other UID" 
* commit 'd4b8baf3ed81582bf1b53b263893b2524641868e':
  Add ability to install credentials as other UID
 2013-03-28 14:29:24 -07:00
Elliott Hughes
94eaab4a5d am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:29:21 -07:00
Geremy Condra
5c3bd37ab7 am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit 'f21a34bf1b188cd662f6a08f5c709f4f641b1494':
  Add data validation on seinfo labels.
 2013-03-28 14:29:17 -07:00
Kenny Root
d4b8baf3ed am 02c86306: Merge "Add ability to install credentials as other UID" 
* commit '02c86306d2569d18a49da3d9228dacb25b1f8973':
  Add ability to install credentials as other UID
 2013-03-28 14:27:13 -07:00
Elliott Hughes
3ae3048377 am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:27:09 -07:00
Geremy Condra
f21a34bf1b am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit '2ff853daa89ca47491c3f7b096872a432d4a19e7':
  Add data validation on seinfo labels.
 2013-03-28 14:27:06 -07:00
Amith Yamasani
6258469c7f Update current.txt due to new API upstream. 
Should fix the build.

Change-Id: Iebf9d0606e262af30b6495d42bcb1a69a67bebc6
 2013-03-28 14:17:37 -07:00
Kenny Root
02c86306d2 Merge "Add ability to install credentials as other UID" 2013-03-28 20:56:58 +00:00
Ying Wang
30d030463b am 1e60b8c2: am 6a9d93ac: Merge "Fix doc build." into jb-mr2-dev 
* commit '1e60b8c26f8c44f1adf14e215fa58e4581d72278':
  Fix doc build.
 2013-03-28 13:56:57 -07:00
Ying Wang
1e60b8c26f am 6a9d93ac: Merge "Fix doc build." into jb-mr2-dev 
* commit '6a9d93ac478a3c971f72197282de13ff0905f1ef':
  Fix doc build.
 2013-03-28 13:55:53 -07:00
Ying Wang
6a9d93ac47 Merge "Fix doc build." into jb-mr2-dev 2013-03-28 20:52:43 +00:00
Ying Wang
b162617143 Fix doc build. 
Change-Id: I479df06f2aed33bf29bb8d90be2339a80248beaa
 2013-03-28 13:50:40 -07:00
Elliott Hughes
a19647d3d8 Merge "Correct executable bit for source files [Take 2]" 2013-03-28 20:50:34 +00:00
Chris Craik
e27491ba23 am a20ae0ad: am dc1975ea: Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev 
* commit 'a20ae0adc710bfa5dae50d8718b14dab4f05812e':
  Fix issues related to saveLayer/restore deferral
 2013-03-28 13:50:06 -07:00
Chris Craik
a20ae0adc7 am dc1975ea: Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev 
* commit 'dc1975ea717cdafb914fd00ea781fd314e1ac478':
  Fix issues related to saveLayer/restore deferral
 2013-03-28 13:49:09 -07:00
Chris Craik
dc1975ea71 Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev 2013-03-28 20:46:47 +00:00