Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,568 Commits 3 Branches 0 Tags
2fc9dfff528c3368a44f0a2193be9626f853e1df
Commit Graph

42427 Commits

Author SHA1 Message Date
Christopher Tate
2fc9dfff52 am 8f72c755: am fb9e3c46: am 3c4efc3e: Merge "Provide outside-facing API for data management intent+label" into lmp-dev 
* commit '8f72c75581c9e1924bf8fab173335ed344673109':
  Provide outside-facing API for data management intent+label
 2014-07-28 23:43:36 +00:00
Jinsuk Kim
b53feae6c9 am 71475173: am a5a9eeaa: am c6a4ac34: Merge "Add MHL getPortInfo" into lmp-dev 
* commit '714751734a867bde0b554f79d219ae436505432a':
  Add MHL getPortInfo
 2014-07-28 23:35:48 +00:00
Yin-Chia Yeh
78e0e0198f am b290566c: am 4bcca6fc: am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit 'b290566cd628230eaef561e38162086da1651a65':
  Camera2: Fix wrong usage of toArray
 2014-07-28 23:35:26 +00:00
Christopher Tate
485536017c am 38ffe5fe: am e1ec86ef: am a2472304: Add data-management intent + label to BackupTransport API 
* commit '38ffe5fe05d6c6d9040f98afb1e7dc61a1750099':
  Add data-management intent + label to BackupTransport API
 2014-07-28 23:34:21 +00:00
Craig Mautner
9e935afab8 am bbd65170: am 99f8774a: am cdc00db0: Make affiliatedTaskId public and unhidden. 
* commit 'bbd6517087a3dad48efd1c4f418971be3c198959':
  Make affiliatedTaskId public and unhidden.
 2014-07-28 21:57:57 +00:00
George Mount
c5f487917e am aee36bb5: am d35a7390: am 2c479d80: Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 
* commit 'aee36bb5e387937917d09f38e25777eda45f1561':
  Allow changing bounds to and from a zero-sized bounds.
 2014-07-28 21:57:52 +00:00
Christopher Tate
9679410db5 Add data-management intent + label to BackupTransport API 
Bug 16346320

Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
 2014-07-28 21:33:15 +00:00
Craig Mautner
22132d7950 Make affiliatedTaskId public and unhidden. 
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().

Fixes bug 16546323.

Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
 2014-07-28 21:10:16 +00:00
Eino-Ville Talvala
3394151fc2 am bd72c6fd: am a0a1c5cc: am c9e436f5: Camera2: CameraManager refurbishing and error management 
* commit 'bd72c6fd39c5b3896a94bcb07d59f172f456dcd4':
  Camera2: CameraManager refurbishing and error management
 2014-07-28 20:32:22 +00:00
Bo Liu
01fb41dfb7 am 752e9172: am e211d641: am 7a286b09: Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 
* commit '752e91720dd4275341e28eb6293da2322b45612d':
  Add WebView.enableSlowWholeDocumentDraw
 2014-07-28 20:24:11 +00:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management 
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
 2014-07-28 20:21:12 +00:00
Robert Greenwalt
06330237c4 am 570ef911: am 41c1e477: am 13c4ee0e: Merge "Remove dead code 1." into lmp-dev 
* commit '570ef91101d084264313f34663a00907e94f46c8':
  Remove dead code 1.
 2014-07-28 19:26:22 +00:00
Sreeram Ramachandran
acd32ca792 am e5d51366: am 05293dc8: am a62c7010: Prohibit address families by default unless a VPN explicitly allows them. 
* commit 'e5d513660eafe2030035c03880e5aafd437c52f4':
  Prohibit address families by default unless a VPN explicitly allows them.
 2014-07-28 19:11:30 +00:00
Sreeram Ramachandran
42065ac64c Prohibit address families by default unless a VPN explicitly allows them. 
Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
 2014-07-28 18:52:41 +00:00
Sandeep Siddhartha
095bc5e2f2 am 82c1ef72: am 9c172801: am d2feddff: Use blob (shared memory) for large data in sound model/recognition event/config 
* commit '82c1ef722cc6b7b3b8df76d91a40db424e811644':
  Use blob (shared memory) for large data in sound model/recognition event/config
 2014-07-28 18:31:17 +00:00
George Mount
a7dc1702af Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 2014-07-28 18:28:56 +00:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
Selim Gurun
d92e726cbe Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b Revert "Load the WebView Java code from an APK." DO NOT MERGE 
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724
 2014-07-28 21:07:24 +01:00
Sandeep Siddhartha
39c12fab49 Use blob (shared memory) for large data in sound model/recognition event/config 
Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
 2014-07-28 11:10:32 -07:00
Vinit Deshpande
a696046dc1 am 47d4eebe: am 34769b01: am 01bbc3c4: Merge "Enable RTT End-to-end" into lmp-dev 
* commit '47d4eebe3eeeab49b41f6141d171ebd1e1d23da7':
  Enable RTT End-to-end
 2014-07-28 17:47:30 +00:00
Alexandra Gherghina
ea1ade4d0b am 028cc238: am 814d50e4: am 705b1376: Return a default icon from the package manager directly 
* commit '028cc238a7e8ac2764c3a381c335b2235401bc4b':
  Return a default icon from the package manager directly
 2014-07-28 17:42:50 +00:00
Alexandra Gherghina
a71e3903e5 Return a default icon from the package manager directly 
Bug: 16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
 2014-07-28 17:30:56 +00:00
George Mount
2cacfe3a98 Allow changing bounds to and from a zero-sized bounds. 
Bug 14590183

Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
 2014-07-28 14:54:23 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
John Reck
1c7a170fa3 Merge "Avoid calling non-final methods in ctor" into lmp-dev 2014-07-25 21:16:23 +00:00
John Reck
aae9f3bf17 Avoid calling non-final methods in ctor 
Bug: 16239227

 Avoid potential issues in views that override invalidate() but
 are not prepared to have overridden methods called prior to their
 ctor

Change-Id: Ic2574bdfea454451d6881c7e27a6474dc4dbc07c
 2014-07-28 09:30:36 -07:00
John Reck
4830cede0c Merge "Throw IAE on invalid scale" into lmp-dev 2014-07-25 21:16:23 +00:00
John Reck
30794944d1 Throw IAE on invalid scale 
Bug: 16565964

Change-Id: I0cc35c532b42433381e1ae7f350c95ecbb4d09c3
 2014-07-28 09:20:21 -07:00
Lorenzo Colitti
c473dc4e4f Add a getBoundURL method that returns a network-specific URL. 
Change-Id: I4b57e675bb87064ab75dcc36b00fdc7a2987b86e
 2014-07-28 16:16:58 +00:00
Andre Eisenbach
d65e8f4b6b LE: Do not invoke callback if retrying read/write operation 
When a descriptor read/write operation fails with insufficient
authentication/encryption, it will automatically be tried again with
elevated security requirements. The first (failed) attempt should not be
reported to the application requesting the read/write, since it will get
the 2nd callback once the retry succeeds/fails.

Change-Id: Ia27b91afa63b6f9ffdc597d59c24d29f3d8a1008
 2014-07-28 15:48:59 +00:00
Robert Greenwalt
39ca3f5f69 Merge "Remove dead code 1." into lmp-dev 2014-07-24 20:48:02 +00:00
Robert Greenwalt
39fa65a3be Remove dead code 1. 
Starting with startUsingNetworkFeature and stop.
Figure it's easier to code review incremental changes.

Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
 2014-07-28 11:34:36 -07:00
Vinit Deshpande
0e31a13faf Merge "Enable RTT End-to-end" into lmp-dev 2014-07-24 20:48:02 +00:00
Vinit Deshpande
c4272f32ae Enable RTT End-to-end 
This change includes various fixes to first RTT implementation and
enables RTT APIs end-to-end. Fixes include proper marshalling of
objects across API and service and JNI fixes.

Change-Id: Ie4ba1ffc6c5b42593e931438b3f03e201ff6be71
 2014-07-28 09:00:10 -07:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo 
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
 2014-07-28 06:57:04 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay 
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
 2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed. 
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
 2014-07-25 22:53:32 +00:00
Yin-Chia Yeh
53bbf11f41 Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 2014-07-24 15:36:21 +00:00
Yin-Chia Yeh
b0056642ca Camera2: Fix wrong usage of toArray 
Change to use "<T> T[]" version of toArray.

Change-Id: I021ed5a4e446b34028810e8acea3395c1c3387e7
 2014-07-28 13:17:05 -07:00
Kenny Guy
466d203c4f Add method to launch settings app details page. 
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
 2014-07-25 15:59:51 +00:00
Julia Reynolds
ea4f01070a Merge "Remove the profile/device owner user restriction bypass." into lmp-dev 2014-07-24 15:36:21 +00:00
Julia Reynolds
401de1785e Remove the profile/device owner user restriction bypass. 
Bug: 16566096

Change-Id: I4a56046df44d36d82edc64fc727e8cad5dc75382
 2014-07-26 17:13:48 +00:00
Amith Yamasani
23a0f0512a Hidden global setting to allow adding users from lockscreen 
This will be undefined/off by default. User has to explicitly
turn it on in the Settings->Users->menu.

Bug: 15760168
Change-Id: I204f28cee2b04832c42e8ec5ced960f6916bfe5a
 2014-07-26 00:58:38 +00:00
Sreeram Ramachandran
eb527ef7a6 Merge "Implement support for bypassable VPNs." into lmp-dev 2014-07-24 15:36:21 +00:00
Fabrice Di Meglio
75b121553f Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker 
- simply create a method for passing those parameters
- remove non needed constants

Change-Id: If6e7d21ff07370edd8c73d1e9b5c5f820f3deb5d
 2014-07-25 22:36:22 +00:00
Sreeram Ramachandran
8cd33ed84e Implement support for bypassable VPNs. 
Bypassable VPNs grab all traffic by default (just like secure VPNs), but:
+ They allow all apps to choose other networks using the multinetwork APIs.
  If these other networks are insecure ("untrusted"), they will enforce that the
  app holds the necessary permissions, such as CHANGE_NETWORK_STATE.
+ They support consistent routing. If an app has an existing connection over
  some other network when the bypassable VPN comes up, it's not interrupted.

Bug: 15347374
Change-Id: Iaee9c6f6fa8103215738570d2b65d3fcf10343f3
 2014-07-25 15:17:23 -07:00
Dake Gu
f7ff2205d9 ExitTransitionCoordinator: suppressLayout during running transition 
b/16570734

Change-Id: I52d7132b91256085aa9e535575e978a6031fb276
 2014-07-25 22:18:57 +00:00
John Spurlock
addcf34645 Merge "Volume: Persist unsafe volume playback time." into lmp-dev 2014-07-24 23:36:47 +00:00