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

102687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Kenny Root
02c86306d2 Merge "Add ability to install credentials as other UID" 2013-03-28 20:56:58 +00: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
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
Amith Yamasani
1438d67e7d am e494a81f: Merge "Restricted account visibility" into jb-mr2-dev 
* commit 'e494a81f9b2727edd1c537f34bf0ea83b2fb0097':
  Restricted account visibility
 2013-03-28 13:34:52 -07:00
Amith Yamasani
e494a81f9b Merge "Restricted account visibility" into jb-mr2-dev 2013-03-28 20:31:44 +00:00
Geremy Condra
2ff853daa8 Merge "Add data validation on seinfo labels." 2013-03-28 20:30:36 +00:00
Ben Cheng
6a1033e3e0 am 3eba5ad1: Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev 
* commit '3eba5ad1e24e8aacb4a8ff0f384f02d2c2474325':
  Crank up the mOomMinFreeHigh values by 50%.
 2013-03-28 13:04:45 -07:00
Ben Cheng
3eba5ad1e2 Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev 2013-03-28 19:59:55 +00:00
Craig Mautner
ad9f879139 am 54241a31: Merge "Add flag to method\'s javadoc." into jb-mr2-dev 
* commit '54241a31e9b5bc45f904f093512a15b4a734ac95':
  Add flag to method's javadoc.
 2013-03-28 12:43:08 -07:00
Craig Mautner
54241a31e9 Merge "Add flag to method's javadoc." into jb-mr2-dev 2013-03-28 19:41:19 +00:00
Maggie Benthall
b3c060a166 am c92342bb: Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 
* commit 'c92342bb01f67597c45f97bbd0debf8221f0ad0d':
  Add user restrictions for bluetooth, sideloading, usb file transfer
 2013-03-28 12:18:28 -07:00
Maggie Benthall
c92342bb01 Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 2013-03-28 19:15:46 +00:00
Craig Mautner
ecbfe253fb Add flag to method's javadoc. 
MOVE_TASK_NO_USER_ACTION was feeling neglected.

Change-Id: I1b8281878e99755ad9960904ba71b83ba3f05620
 2013-03-28 11:58:25 -07:00
Jeff Brown
0c454a0a7a am 1263deb9: Merge "Allow system server to bind to USB devices." into jb-mr2-dev 
* commit '1263deb936e02c9f6045ace42ebb3abbb64625a9':
  Allow system server to bind to USB devices.
 2013-03-28 11:57:59 -07:00
Jeff Brown
bdecb57497 am 0aba3b18: Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev 
* commit '0aba3b18a8c32d8ea349fead8c1649617220d2da':
  Support specifying buffer start offset for USB requests.
 2013-03-28 11:57:57 -07:00
Jeff Brown
1263deb936 Merge "Allow system server to bind to USB devices." into jb-mr2-dev 2013-03-28 18:55:10 +00:00
Romain Guy
e6b6c2f575 am 58f7689a: Merge "Don\'t crash when making a layer larger than supported dimensions Bug #8437401" into jb-mr2-dev 
* commit '58f7689ac634afa616d2b754b68d65f9a2e83814':
  Don't crash when making a layer larger than supported dimensions Bug #8437401
 2013-03-28 11:54:16 -07:00