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

102484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
8813998628 am e450c3cd: Merge "Fix docs build." into jb-mr2-dev 
* commit 'e450c3cd8d135972eaa8237f1d4587ed7d887c2f':
  Fix docs build.
 2013-03-26 16:26:47 -07:00
Amith Yamasani
e450c3cd8d Merge "Fix docs build." into jb-mr2-dev 2013-03-26 23:23:32 +00:00
Amith Yamasani
ca050adc13 Fix docs build. 
Change-Id: I959db164f0ed7badfcdf921ffa1bfff60b4fb952
 2013-03-26 16:19:46 -07:00
Michael Wright
09f4d8198a am cf797a5e: Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev 
* commit 'cf797a5e43873ef819974f67dea29e424b244079':
  Deliver key repeats for artificial dpad events
 2013-03-26 16:13:12 -07:00
Michael Wright
cf797a5e43 Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev 2013-03-26 23:11:15 +00:00
Adam Powell
36375eca1a am 7f51ae71: Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev 
* commit '7f51ae71f170f61439516321a107507c4d1c0ac0':
  Fix some visibility state transition issues with ActionBarView
 2013-03-26 15:56:45 -07:00
Adam Powell
7f51ae71f1 Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev 2013-03-26 22:51:52 +00:00
Adam Powell
6684e92ae8 Fix some visibility state transition issues with ActionBarView 
Restore state as expected for titles and expanded action views.

Bug 8246128

Bug 8479205

Change-Id: Icad59685c5eab241f19ecd94479dc5e7a9f678b6
 2013-03-26 15:38:26 -07:00
Amith Yamasani
ed7d0e0e65 am 05191053: Match tests to new API. 
* commit '05191053545065c9c71afae173d3ab42a2d947fa':
  Match tests to new API.
 2013-03-26 15:36:58 -07:00
Amith Yamasani
0519105354 Match tests to new API. 
Change-Id: I9a537a437c721ae64d9307b889b9de5d5429670f
 2013-03-26 15:32:29 -07:00
Amith Yamasani
f3dc9f0aa9 am df5e9fe1: Merge "Device Owner, a special kind of device admin" into jb-mr2-dev 
* commit 'df5e9fe1819099097901641b1267374ca0bbc319':
  Device Owner, a special kind of device admin
 2013-03-26 15:28:55 -07:00
Amith Yamasani
df5e9fe181 Merge "Device Owner, a special kind of device admin" into jb-mr2-dev 2013-03-26 22:27:13 +00:00
Irfan Sheriff
db3792d129 am 8074cc0c: Merge "Fix string for tablet" into jb-mr2-dev 
* commit '8074cc0c068c06cea7e174f82c0f1c235fae43a7':
  Fix string for tablet
 2013-03-26 15:15:16 -07:00
Irfan Sheriff
8074cc0c06 Merge "Fix string for tablet" into jb-mr2-dev 2013-03-26 22:11:11 +00:00
Amith Yamasani
71e6c697e5 Device Owner, a special kind of device admin 
A Device Owner cannot be uninstalled and is available to all users. It must
be registered before the device_provisioned flag is set.

Device admins can be disabled until used, but visible to device policy
manager, so that users wont be bothered with update requests.

Opened up a few related APIs for use by a system-installed Device Owner.

Change-Id: I847b5fe68c0f724863f778a67602b5bddc79d8e5
 2013-03-26 15:09:08 -07:00
Elliott Hughes
08b025bd3d am c5f790f3: am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit 'c5f790f3ba6981c0ddf0046fffeaea1ee04b008d':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 15:02:36 -07:00
Elliott Hughes
c5f790f3ba am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '145e60b3e31f8daaf8e12dba0668c12e47968dd1':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:58:10 -07:00
Elliott Hughes
145e60b3e3 am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '6c75deb5050c7fdde15b04aa96aa61c7b586e1f9':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:56:03 -07:00
Elliott Hughes
6c75deb505 Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 2013-03-26 21:39:51 +00:00
Michael Wright
40f8f0d136 Deliver key repeats for artificial dpad events 
Bug: 8425219
Change-Id: Ib41b06ed40d43f2e30ce2a647871a76cea80177b
 2013-03-26 14:34:14 -07:00
Jeff Sharkey
e07cc0f399 am 0e93adc6: Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev 
* commit '0e93adc6e93cd16b6e8485d699a29c91878c791e':
  Update TrafficStats docs to reflect behavior.
 2013-03-26 14:24:06 -07:00
Jason Sams
8b8ca344b2 am f3f0e155: Merge "Add yuv get" into jb-mr2-dev 
* commit 'f3f0e155e11a705352239506e5a4adcfdacf2f4a':
  Add yuv get
 2013-03-26 14:20:34 -07:00
Jeff Sharkey
0e93adc6e9 Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev 2013-03-26 21:20:19 +00:00
Irfan Sheriff
cf7c1b4dfb Fix string for tablet 
Bug: 7467441
Change-Id: I77661097a8562d789089b81bc8b3ae93ff6ddcc4
 2013-03-26 14:17:28 -07:00
Jason Sams
f3f0e155e1 Merge "Add yuv get" into jb-mr2-dev 2013-03-26 21:15:36 +00:00
Irfan Sheriff
16c06fee5c am f5186417: Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev 
* commit 'f51864176be7356d609e6221e2109d49799673b1':
  Fix clearing linkproperties on disconnect
 2013-03-26 13:50:25 -07:00
Irfan Sheriff
f51864176b Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev 2013-03-26 20:47:25 +00:00
Jeff Sharkey
dddace7582 Update TrafficStats docs to reflect behavior. 
Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa
 2013-03-26 13:46:09 -07:00
Irfan Sheriff
81196b207a Fix clearing linkproperties on disconnect 
Bug: 5472644
Change-Id: If2b32b16fd3d65f1da12a9c5a8083d50125283d5
 2013-03-26 13:38:57 -07:00
Jason Sams
5a722cf8b2 Add yuv get 
Change-Id: I6df5c0a8129283c0ad600b232790da10c395b479
 2013-03-26 13:27:37 -07:00
Elliott Hughes
a480dafbf2 Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo. 
It was possible to overrun this buffer, and even if you did fill
the buffer in a single read and exit the loop, the "string" still
wouldn't be terminated.

Bug: 8468088
Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
 2013-03-26 13:18:52 -07:00
Michael Wright
1426be82b4 am c3d8790d: Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev 
* commit 'c3d8790d53d23c4d9d3b9557d5811fde66ab791c':
  Remove misleading documentation from SystemClock
 2013-03-26 13:17:16 -07:00
Michael Wright
c3d8790d53 Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev 2013-03-26 20:13:17 +00:00
The Android Open Source Project
6b749cd07a Reconcile with jb-mr2-release - do not merge 
Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d
 2013-03-26 10:49:24 -07:00
Jeff Sharkey
dac3a54638 am 7e9221c5: Merge "It helps to catch the right exception." into jb-mr2-dev 
* commit '7e9221c5548b711bb083589d2c0d32eb6cf2fb8d':
  It helps to catch the right exception.
 2013-03-26 10:33:32 -07:00
Jeff Sharkey
7e9221c554 Merge "It helps to catch the right exception." into jb-mr2-dev 2013-03-26 17:29:43 +00:00
Jeff Sharkey
9ae62f5934 It helps to catch the right exception. 
Bug: 7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
 2013-03-26 10:29:01 -07:00
Joe Malin
bc9e97abe6 am 3be53a86: am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '3be53a86dc5ee08e45c7fd657084107fa7ed2e1b':
  Android Training: Accessing Contacts
 2013-03-26 09:45:30 -07:00
Joe Malin
3be53a86dc am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '3e904d62b6df1b8b99aa53ff62aee752b41c5163':
  Android Training: Accessing Contacts
 2013-03-26 09:42:51 -07:00
Joe Malin
3e904d62b6 am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e4ba94e550814422784b630acab80f104460384d':
  Android Training: Accessing Contacts
 2013-03-26 09:41:30 -07:00
Joe Malin
e4ba94e550 am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff':
  Android Training: Accessing Contacts
 2013-03-26 09:39:23 -07:00
Joe Malin
e64253fbca am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '0e84afdb946613ef3ccfd40f9eccf98eaf3f1521':
  Android Training: Accessing Contacts
 2013-03-26 09:37:58 -07:00
Joe Malin
0e84afdb94 am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '1be81a96bbd43133eb70ce52515d5cc91d270bc8':
  Android Training: Accessing Contacts
 2013-03-26 09:36:26 -07:00
Joe Malin
1be81a96bb am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '98827948f1911af89687d991c5549ec1b8b8549a':
  Android Training: Accessing Contacts
 2013-03-26 09:33:51 -07:00
Joe Malin
98827948f1 Merge "Android Training: Accessing Contacts" into jb-mr1-dev 2013-03-26 16:31:22 +00:00
The Android Automerger
0ade9294f5 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:55:46 -07:00
Geremy Condra
e76fab2a42 am df4144f4: am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit 'df4144f4dfaa3a344cfdf923121f6113463978da':
  BackupManagerService files need new security labeling.
 2013-03-26 05:32:02 +00:00
Geremy Condra
df4144f4df am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '9fa57b74d8acb99c86f761a98f6e76998de8aff2':
  BackupManagerService files need new security labeling.
 2013-03-25 22:29:10 -07:00
Geremy Condra
9fa57b74d8 am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8':
  BackupManagerService files need new security labeling.
 2013-03-25 22:26:56 -07:00
Geremy Condra
2aee33c1cd Merge "BackupManagerService files need new security labeling." 2013-03-26 05:10:38 +00:00