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

102669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
0aba3b18a8 Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev 2013-03-28 18:53:33 +00:00
Romain Guy
58f7689ac6 Merge "Don't crash when making a layer larger than supported dimensions Bug #8437401" into jb-mr2-dev 2013-03-28 18:50:53 +00:00
Chris Craik
7273daace9 Fix issues related to saveLayer/restore deferral 
bug:8464795

Changes drawModifiers and alpha to be restored for all operations,
since saveLayer/restore use these values, not just draw operations

Also forces a renderer state restoration before a deferred restore op
is played back, in case it is associated with a saveLayer that
doesn't have the save_clip flag set

Change-Id: I9da5d44fefbfffdee164c98f4f139843dacf85df
 2013-03-28 11:33:13 -07:00
Romain Guy
ce4a7dfc51 Don't crash when making a layer larger than supported dimensions 
Bug #8437401

A misplaced ref count decrement was causing a crash when attempting to
resize a layer to dimensions larger than the max texture size supported
by the GPU.

This change fixes the crash and clarifies the warnings to make it more
obvious what's happening.

Change-Id: I632dc1b90aaa2605969e10523491a81c4922d3dc
 2013-03-28 11:32:33 -07:00
Kenny Root
3e7be43e25 Add ability to install credentials as other UID 
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I652b7e6fa93deda6d6d310be33f224e5a356c787
 2013-03-28 11:30:11 -07:00
Irfan Sheriff
7109073067 am ce449d9e: Merge "Add support for setMiracastMode" into jb-mr2-dev 
* commit 'ce449d9ee521052bb6c24885a3599a19841eae5d':
  Add support for setMiracastMode
 2013-03-28 10:32:04 -07:00
Irfan Sheriff
ce449d9ee5 Merge "Add support for setMiracastMode" into jb-mr2-dev 2013-03-28 17:29:14 +00:00
Irfan Sheriff
8b485adffd Add support for setMiracastMode 
Usage is setMiracastMode(WifiP2pManager.MIRACAST_SOURCE) or
setMiracastMode(WifiP2pManager.MIRACAST_SINK) as an example.
Only available for internal use and can be called as long as
driver is active. P2p connection is not needed for it to be
called

Bug: 8493089
Change-Id: I1f87eaf3311212aae980077de26c05651a8cc811
 2013-03-28 10:27:17 -07:00
Robert Greenwalt
766991ae21 am 5acc8632: Merge "Add BT - DataTracker connection" into jb-mr2-dev 
* commit '5acc8632a76da2b91af549c0cee938ed938a3f16':
  Add BT - DataTracker connection
 2013-03-28 09:49:27 -07:00
Robert Greenwalt
5acc8632a7 Merge "Add BT - DataTracker connection" into jb-mr2-dev 2013-03-28 16:45:33 +00:00
Robert Craig
d417ab0ea5 Add data validation on seinfo labels. 
Ensure that policy contains a clean seinfo
string. Where clean means no whitespace characters.

Change-Id: I814411cbc8d16eaed99a1389f5487529e36e617b
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-03-28 12:19:27 -04:00
Wink Saville
64725af5a4 am 224100f7: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev 
* commit '224100f7055ae9caae03a94252dc2d952cbfc0ab':
  Cleanup some debug in LinkCapabilities and Properties.
 2013-03-28 09:14:12 -07:00
Wink Saville
224100f705 Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev 2013-03-28 16:09:26 +00:00
Jeff Brown
e8eea12a24 Allow system server to bind to USB devices. 
Change-Id: I31f9ed1ff3fcda53f62f08ae198d18d0df3321b7
 2013-03-28 03:15:40 -07:00
Jeff Brown
6c81a93ef3 Support specifying buffer start offset for USB requests. 
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
 2013-03-28 03:13:09 -07:00
kmccormick
14803716ff am 7e81e223: am 9773b6e9: am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit '7e81e223f5d6152e35b8a441330e142734fb7afa':
  Doc update: typo
 2013-03-27 19:31:53 -07:00
kmccormick
da505fe54e am 61c213ad: am fcc42da4: am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit '61c213ad54cde63e6ef288e8038bcdd605ddbfb2':
  Doc update: use parse, not new
 2013-03-27 19:31:50 -07:00
kmccormick
d805e374c2 am 24b8947f: resolved conflicts for merge of 603f987f to jb-mr2-dev 
* commit '24b8947f62d9bdb91aae408894faa5fe59564e46':
  Doc change: Fix typo DONT_DELTE
 2013-03-27 19:28:23 -07:00