Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,151 Commits 3 Branches 0 Tags
dd8877bceddfda9f1802fa01ac662b22bc8c9020
Commit Graph

36388 Commits

Author SHA1 Message Date
Igor Murashkin
3242f4fb19 camera2: Fix @see being emitted into middle of javadoc (+more) 
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
  markdown, causing spurious <code> blocks to be emitted

Bug: 12552669
Change-Id: I4c6615ec47810757b8348995db2b199222a3a77e
 2014-01-15 12:27:41 -08:00
Jeff Hao
70216e599e am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit 'ac20b469259129df948bae1fa5434098b1801185':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:50:53 +00:00
Jeff Hao
ac20b46925 am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '6c13f384749150e9fa6f930023a9161fe97402d0':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:48:18 +00:00
Jeff Hao
6c13f38474 am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:45:06 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 11:41:30 -08:00
Zhijun He
399f05d1e7 Camera2: Update awbMode related javadoc spec 
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
 2014-01-15 11:31:30 -08:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing. 
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
 2014-01-15 11:27:24 -08:00
John Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00
John Reck
2114aef4ea Remove dead code 
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
 2014-01-15 09:37:38 -08:00
Marco Nelissen
7a993a3d54 am 4e53edf7: am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '4e53edf7ea8f8158a123a451530146f23e3fed81':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:33:42 +00:00
Marco Nelissen
4e53edf7ea am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:29:43 +00:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Zhijun He
78146ecb24 Camera2: Update AF mode related javadoc specs 
Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd
 2014-01-14 18:12:13 -08:00
Zhijun He
fb46c644ce Camera2: metadata tag javadoc update 
Change-Id: I66700340780f3185796f25c054487f439f24a6fb
 2014-01-14 17:57:23 -08:00
Alan Viverette
4b95cc7ef7 Quick fix for updating the FastScroller long list property 
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
 2014-01-14 16:54:02 -08:00
Matthew Xie
91da5b6830 Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev 
* changes:
  BLE peripheral mode (3/4): Add peripheral mode API.
  NPE in BluetoothSocket.write()
 2014-01-14 20:44:16 +00:00
John Spurlock
88926a5482 am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '4b67b88e344a147317fc6b32e5364d4cfabf1e1d':
  Docfixes: three typos and escape */*.
 2014-01-14 20:04:25 +00:00
John Spurlock
4b67b88e34 am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'cce06eda6bd6af957b261f66eb8ea3623fe09caf':
  Docfixes: three typos and escape */*.
 2014-01-14 20:00:42 +00:00
John Spurlock
cce06eda6b am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
  Docfixes: three typos and escape */*.
 2014-01-14 19:57:02 +00:00
John Spurlock
b343635909 am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
  Docfixes: three typos and escape */*.
 2014-01-14 11:54:25 -08:00
John Spurlock
e05190eae7 am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
  Docfixes: three typos and escape */*.
 2014-01-14 19:50:38 +00:00
Narayan Kamath
3a248a1493 am ec70f809: am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'ec70f8091185cd68afd4fcda42b513111eae70e4':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:26:18 +00:00
Narayan Kamath
ec70f80911 am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'd34950cfc66e258caba14c7ddc553028647898f1':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:23:44 +00:00
Narayan Kamath
d34950cfc6 am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '80b0496abeb03fe4c5086430218c7e4bcf3773db':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:20:33 +00:00
Narayan Kamath
80b0496abe am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '2db26788ab367f08cb5378d77e22e8939e7a28c2':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 02:16:39 -08:00
Narayan Kamath
e71afc2ea7 Merge "Revert "Hide AssetInputStream.getAssetInt."" 2014-01-14 10:09:50 +00:00
Narayan Kamath
b1bd1fe7fd Revert "Hide AssetInputStream.getAssetInt." 
This reverts commit 842d44ec17.

Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
 2014-01-14 10:08:45 +00:00
Narayan Kamath
cce8e8a5c7 am 7f4dd912: am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '7f4dd91299051d89e04979ba26ee5c27472f49d4':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 09:57:37 +00:00
Narayan Kamath
7f4dd91299 am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 09:54:33 +00:00
Narayan Kamath
271b28ac31 am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '8021316010fb4bd18a29751949eb2cda66199b6e':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 01:51:14 -08:00
Narayan Kamath
ac8ccc3c18 Merge "Hide AssetInputStream.getAssetInt." 2014-01-14 09:45:41 +00:00
Narayan Kamath
842d44ec17 Hide AssetInputStream.getAssetInt. 
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.

(cherry picked from commit f8f09a15a4)

Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
 2014-01-14 09:34:00 +00:00
Narayan Kamath
f8f09a15a4 Hide AssetInputStream.getAssetInt. 
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.

Change-Id: If02d42a528b9d90f11cb25c3342404b7d5f7b625
 2014-01-14 09:31:29 +00:00
Zhihai Xu
9efa3b6c63 Merge "NPE in BluetoothDevice.fetchUuidsWithSdp" 2014-01-14 06:47:06 +00:00
Wei Wang
86b3fa6090 BLE peripheral mode (3/4): Add peripheral mode API. 
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
 2014-01-13 17:53:48 -08:00
Zhihai Xu
82e95573c7 NPE in BluetoothSocket.write() 
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
 2014-01-13 17:52:13 -08:00
Zhihai Xu
5d04f1c9d9 NPE in BluetoothDevice.fetchUuidsWithSdp 
This is caused by access fetchUuidsWithSdp after bluetooth is turned off.
We can add check null pointer for sService,
before call sService.fetchRemoteUuids(this) to fix this problem;

bug:12533948
Change-Id: Id2cab92a56185073fabcabcfb21a243e99a60cee
 2014-01-13 16:54:38 -08:00
Eino-Ville Talvala
1429839143 Merge "Camera2: Docs: Update cross-refs, aeMode, aeAntibandingMode" 2014-01-13 23:53:53 +00:00
Eino-Ville Talvala
0da8bf5dbc Camera2: Docs: Update cross-refs, aeMode, aeAntibandingMode 
Unhide android.control.aeMode and android.control.availableAeModes,
which were supposed to be public all along.

This matches up to system/media commit #9fa0d90ff

Change-Id: Ibba2756dd5889344b5d0531dc6f066566776cdc1
 2014-01-13 15:44:04 -08:00
Svetoslav
7f79302d2b Merge "ProgressBar is important for accessibility by default." 2014-01-13 23:31:32 +00:00
Svetoslav
7face75f2c ProgressBar is important for accessibility by default. 
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.

Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
 2014-01-13 15:26:02 -08:00
Alan Viverette
b4914267ca Merge "Move drag-to-open handling into ActionMenuItemView" 2014-01-13 23:02:31 +00:00
Alan Viverette
56110725f2 Move drag-to-open handling into ActionMenuItemView 
This prevents the menu item's OnClickListener from being overwritten,
allows the client to override item invocation, and prevents showing
multiple popups when items are re-initialized.

BUG: 11969895
BUG: 12489213
Change-Id: I97ca737810073df348171cdba5442f24a5527f89
 2014-01-13 22:46:50 +00:00
Narayan Kamath
793bbd2929 am 909427d0: am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit '909427d093c30d2d4f4ffe5da19f1db6c3e9a3b3':
  Fix preference puts with "null" values.
 2014-01-13 13:10:53 +00:00
Narayan Kamath
909427d093 am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'f588d2dff2ca6000fe02c5ac6e85f97133477767':
  Fix preference puts with "null" values.
 2014-01-13 13:07:47 +00:00
Narayan Kamath
f588d2dff2 am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'd0ec6d8c505142a51a6c1bfb3637d4a49aa05f32':
  Fix preference puts with "null" values.
 2014-01-13 13:04:28 +00:00
Narayan Kamath
d0ec6d8c50 am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
  Fix preference puts with "null" values.
 2014-01-13 05:01:44 -08:00
Narayan Kamath
cb4d3ec1ea Merge "Fix preference puts with "null" values." 2014-01-13 12:29:41 +00:00