Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,404 Commits 3 Branches 0 Tags
6ea12eaa2c8ff9e1d78ef496f28f4cc3e400a733
Commit Graph

42773 Commits

Author SHA1 Message Date
Geoffrey Borggaard
d213923d48 am 83e405ec: am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 
* commit '83e405ec2dc5430f5f9bb4cec68ca85412441838':
  Fixes setting password through DevicePolicyManager
 2014-07-24 19:57:44 +00:00
Robin Lee
1dd78a0952 am 697bec20: am 93c947f9: Show disclosure when an intent switches profiles 
* commit '697bec204d61703fa2871a224dd92cdf3440e167':
  Show disclosure when an intent switches profiles
 2014-07-24 19:49:23 +00:00
Alan Viverette
9f5e76977b am 9343df3d: am 5e9d2bfb: Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev 
* commit '9343df3d6e9a91a0147d7ac35116291ba51e6297':
  Allow medium-long-press to initiate drag-to-open menus
 2014-07-24 19:48:19 +00:00
Yorke Lee
1a529e4487 am 59942b1b: am 6faad8cb: Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev 
* commit '59942b1be5ca62e83bcb09121203dca89971fd54':
  Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL
 2014-07-24 19:48:08 +00:00
Jungshik Jang
a81ca12dc3 am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record. 
* commit '13dcf17a859bb88569dc93287d69054d213a3e89':
  Implement OneTouchRecordAction and stop one touch record.
 2014-07-24 19:48:03 +00:00
Jungshik Jang
b53fa20a5d am b32da7b5: am 5dfe8261: Merge "Add @hide and @SystemApi to HdmiTimerRecordSources" into lmp-dev 
* commit 'b32da7b59497b1b569b8fe71c32747e8a45a6997':
  Add @hide and @SystemApi to HdmiTimerRecordSources
 2014-07-24 19:47:46 +00:00
Geoffrey Borggaard
832f82f9eb am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 
* commit '1b09c716096ccada799c6fde6cb397b3e307b709':
  Fixes setting password through DevicePolicyManager
 2014-07-24 19:46:46 +00:00
Yorke Lee
7a5e5726ab Add Calls.TRANSCRIPTION to CallLog (2/2) 
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
 2014-07-24 08:30:33 -07:00
Justin Morey
80440cc853 Expose setActiveProfileOwner() using @SystemApi 
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)
 2014-07-24 15:23:09 +00:00
Adrian Roos
4f994eb2dd Disable trust agents after wrong credential is entered 
Bug: 16498202
Change-Id: I36f2e80aec8c04bcb6e6d9f1b0e2ebb8fc49998e
 2014-07-24 14:32:26 +00:00
Justin Morey
254644779c Expose setActiveProfileOwner() using @SystemApi 
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
 2014-07-24 09:17:28 -05:00
Robin Lee
3ea4310a22 Show disclosure when an intent switches profiles 
If an activity in one profile starts an activity in another profile
without any user interaction - such as operating the chooser - a toast
appears, saying something like 'you are using this app in your work
space'.

@bug 14375080

Change-Id: Id2dc5973a9b68ee29d0227947c19b78f021fb6ac
 2014-07-24 09:12:55 +00:00
Wei Wang
0e81ca2543 Move AdvertiseData length check to BluetoothAdvertiser. 
This will keep AdvertiseData simple and avoid coupling with
BluetoothAdapter.

Change-Id: I3609652bdea1c6e757bac7d2dada7f8ddf20a5e3
 2014-07-23 20:39:12 -07:00
Bo Liu
9f3ed850b6 Add WebView.enableSlowWholeDocumentDraw 
BUG: 16300353
Change-Id: Id4475f04f32bb176a6a59ee9d5a09e3f65b94ef0
 2014-07-23 19:39:46 -07:00
Jungshik Jang
b6591b8e53 Implement OneTouchRecordAction and stop one touch record. 
In addition to it, add api for clearTimerRecording as well.
Separately, I will replace logic for notifying message with callback
interface.

Bug: 16160962

Change-Id: I2368f7c697eb44ed4542c0ec4412c63a6ae41a5c
 2014-07-24 11:11:38 +09:00
ztenghui
397f6ee931 am 6ff3dce5: am b3067e74: am 69e50375: Add negative sign separation support in the pathData 
* commit '6ff3dce5a65494a4ae98949a0d9452045f8af9d6':
  Add negative sign separation support in the pathData
 2014-07-23 22:00:12 +00:00
Alan Viverette
f6a5fd39a0 am 8ec7d394: am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '8ec7d394252ee801ded0bde940c8f7358cbc9099':
  Use activity for brightness dialog
 2014-07-23 22:00:07 +00:00
ztenghui
b3d6bd21c8 am b3067e74: am 69e50375: Add negative sign separation support in the pathData 
* commit 'b3067e74831c423ac66a19d268831def94f8e6c3':
  Add negative sign separation support in the pathData
 2014-07-23 21:55:56 +00:00
Alan Viverette
815382c8b6 am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '014089cd92401236b160c0f3384b430c1f610e34':
  Use activity for brightness dialog
 2014-07-23 21:55:50 +00:00
ztenghui
5a836f74df Add negative sign separation support in the pathData 
bug:14585171

Change-Id: I61dec27856be09c44bb1d32ff61b3c3cd458cc34
 2014-07-23 21:46:16 +00:00
Adam Lesinski
2c72b6822d Add <feature-group> tag and change aapt badging 
A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.

Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.

Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.

Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023
 2014-07-23 14:11:46 -07:00
Robert Ly
39572996f2 am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:06:47 +00:00
Jae Seo
8c4ea37021 am 40a7428f: am 3555e7c6: am e51d3b9d: Fix build 
* commit '40a7428f2e2bded8623fb58409ae430fc8f80a3d':
  Fix build
 2014-07-23 20:31:53 +00:00
Jae Seo
9754a3a510 am 3555e7c6: am e51d3b9d: Fix build 
* commit '3555e7c6693a170a2fb8c432c0b00b1f537074b1':
  Fix build
 2014-07-23 20:28:01 +00:00
Jae Seo
80bc75a71e Fix build 
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
 2014-07-23 13:16:46 -07:00
Nicolas Prevot
2b122164c8 Merge "Making the clipboard work across users." into lmp-dev 2014-07-23 19:32:39 +00:00
Nicolas Prevot
f1939901d2 Making the clipboard work across users. 
When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964
 2014-07-24 10:25:57 +00:00
Neil Fuller
4c3ae42756 Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev 2014-07-23 19:33:16 +00:00
Neil Fuller
3b852e3489 Rewriting android.text.format.Time without the native _tz functions 
(cherry picked from commit d7f0849b8c)
Bug: 15765976

Change-Id: I00f72bd1043ef20f22d25559206b2f741334ba9c
 2014-07-24 11:37:20 +01:00
Tao Bai
d673c47491 am f56d307b: am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev 
* commit 'f56d307b4b082c15a17898bf00fc2ee60a100386':
  WebView permission change
 2014-07-23 19:32:00 +00:00
Tao Bai
deee14685d am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev 
* commit 'd5874836d84053a2f887470200901008f6797735':
  WebView permission change
 2014-07-23 19:28:00 +00:00
Eino-Ville Talvala
3eaf05593b am fc4bbebd: am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit 'fc4bbebdc5e35c1f5c932e1b6d9b266f68d6ce28':
  Camera2: Fix callback operation
 2014-07-23 19:28:00 +00:00
Jungshik Jang
f3fa471d96 Add @hide and @SystemApi to HdmiTimerRecordSources 
Change-Id: I3938b26af4ca2fe8d70224bd7bac30ba627d6d44
 2014-07-24 09:56:28 +09:00
Eino-Ville Talvala
9630b94a69 am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit '6cfa6b5b1ca3ecab93337835792f2afb71613d5a':
  Camera2: Fix callback operation
 2014-07-23 19:23:47 +00:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation 
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
 2014-07-23 19:14:10 +00:00
Prerepa Viswanadham
6ef301dbc5 am e2983f8c: am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'e2983f8c83b0ce2f067322b07cf10c735cb044e8':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:12:23 +00:00
Ye Wen
ec0fe24937 am 1a9a6cef: am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit '1a9a6cefcb5f79a3421eac3a62d212c34ca2e75d':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:12:19 +00:00
Prerepa Viswanadham
eaae99f288 am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'bdbd1b3b6ba06e2c52ce375e4221df4853e88319':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:05:44 +00:00
Ye Wen
bb1c3eeafe am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:05:41 +00:00
Alan Viverette
ef7ebbdff1 Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
bca05f5ce7 Allow medium-long-press to initiate drag-to-open menus 
BUG: 16352041
Change-Id: I58933ae8cce1b3cecc1c533338d02a2f6ef1523b
 2014-07-23 20:15:44 -07:00
Tao Bai
67ac461a0a Merge "WebView permission change" into lmp-dev 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change 
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
 2014-07-23 12:16:55 -07:00
Prerepa Viswanadham
8caac741a0 Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
 2014-07-23 18:54:46 +00:00
Alan Viverette
f84bc66b21 Merge "Use activity for brightness dialog" into lmp-dev 2014-07-23 18:50:38 +00:00
Wei Wang
11dfc508d7 am 386deb92: am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '386deb926ca8309d1486b8b61f825710be9cbcef':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:54:04 +00:00
Wei Wang
4f22c47d87 am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '03aeeb294657a616710aca3ff8e1ca5080a1b67b':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:50:00 +00:00
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1 
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
 2014-07-23 20:54:50 +00:00
Yorke Lee
fd4354a9ee Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev 2014-07-23 18:31:55 +00:00
Yorke Lee
624d0d64ab Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL 
Change-Id: I6e1a4811f822f2211070edd7c9aa486005e53cea
 2014-07-23 19:09:27 -07:00