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

39070 Commits

Author SHA1 Message Date
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
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
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00: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
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
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
Primiano Tucci
4da204bfaf Refactor native library path logic in WebViewFactory 
This CL changes the relro creation and loading logic.
Instead of using a hardcoded path, now WebViewFactory queries the
package manager to get the lib path, which will be either
/system/priv-app/webview/lib/ or /data/app/... depending on the
presence of an update apk.

BUG:16403706
Change-Id: Icceb95da98e69032a19ac2ae8fe72ba1439e50ad
 2014-07-28 18:26:36 +01:00
John Reck
6bc2482984 am 91c75b7a: am 178cc39a: am 408e5e2d: Merge "Avoid calling non-final methods in ctor" into lmp-dev 
* commit '91c75b7a40f8b72e9368f685f98ab4e0012b70d2':
  Avoid calling non-final methods in ctor
 2014-07-28 17:00:39 +00:00
John Reck
1a4f7d9204 am 98c651a2: am 9d1ee7e1: am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev 
* commit '98c651a222ae8e26ba4c8899b8922e2ea6e877f1':
  Throw IAE on invalid scale
 2014-07-28 17:00:35 +00:00
Lorenzo Colitti
a798d7a05c am 9b393371: am d19032b6: am c98cb483: Add a getBoundURL method that returns a network-specific URL. 
* commit '9b393371a93e76311a979ea640eab903d0c54380':
  Add a getBoundURL method that returns a network-specific URL.
 2014-07-28 16:34:24 +00:00
Andre Eisenbach
31e6f7b5db am 199d02e7: am 3c809c8c: am c49758ce: LE: Do not invoke callback if retrying read/write operation 
* commit '199d02e7581ae31505be88144719ed0edfa63255':
  LE: Do not invoke callback if retrying read/write operation
 2014-07-28 16:03:37 +00:00
Marcin Kosiba
f5f74b8fdf Append WebView assets to AssetManager when loading the WebView. 
This makes the code loading the WebView Java code from the .apk
also load the WebView assets into the current AssetManager.

BUG: 11505352
Change-Id: Ib6203f79b98805012ffa20b233037b7da221624c
 2014-07-28 16:21:40 +01:00
Primiano Tucci
a80c6b4a7f Merge "Introduce startIsolatedProcess private API in ActivityManager" 2014-07-24 15:35:58 +00:00
Nicolas Prevot
58be247880 am 8970eaab: am 28a0e9e2: am 40c0332b: Merge "Storing the app who sets a CrossProfileIntentFilter." into lmp-dev 
* commit '8970eaabce4cc4117e61aa95c6960a23306f5936':
  Storing the app who sets a CrossProfileIntentFilter.
 2014-07-28 13:26:27 +00:00
Sander Alewijnse
470371c34e am 663c8ed4: am 5a643bc3: am 2705a2e4: Merge "Add http cookie header key as a provisioning extra." into lmp-dev 
* commit '663c8ed4666e48755bcc7f381845085d431cad6e':
  Add http cookie header key as a provisioning extra.
 2014-07-28 13:20:48 +00:00
Alexandra Gherghina
0a63289632 am 7399e9cd: am 4509dc1b: am f9bd84de: Update string for account manager failures 
* commit '7399e9cd62f7d5171eeb300c49775a496abc653c':
  Update string for account manager failures
 2014-07-28 12:14:51 +00:00
Wei Wang
104d187d10 am b6a313ef: am 06ef8e73: am 4e2bcebc: Split manu id and manu data. 
* commit 'b6a313ef2b71f9080af10fb9f7a4f40d6d5bee0e':
  Split manu id and manu data.
 2014-07-28 12:14:47 +00:00
Primiano Tucci
f080c3a529 Introduce startIsolatedProcess private API in ActivityManager 
The new API spawns a isolated process, using a custom uid, entrypoint and
abi. Such API is used by the WebViewFactory to spawn its unpriviledged
but trusted process (hence the fixed uid) which rewrites the rerlo file
on boot / when an update occurs.
Since both the ActivityManager service and the WebViewUpdate service
live in the SystemServer their calls be dispatched locally and no
binder interface needs to be exposed for the new startIsolatedProcess API.

BUG:16403706
Change-Id: I327b59735c12698595e0dbcc4da5d759c9103b0a
 2014-07-28 12:33:53 +01:00
Alexandra Gherghina
f7f8fd64c8 Update string for account manager failures 
Bug: 14642886
Change-Id: I200e38c7a93990787a3d6e01a583fe8ba193a987
 2014-07-28 07:41:40 +00:00
Wei Wang
ab2ed62f15 Split manu id and manu data. 
b/16407380

Change-Id: I39f6ce0ab4cccadec809f0a4f518f5d2c77a90b7
 2014-07-27 23:12:26 -07:00
Jeff Brown
2da6665002 am 8bfbd2f6: am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev 
* commit '8bfbd2f61ffb8cc9e167b45ae0306f05af54d10d':
  Remove DozeHardware since it will not be used.
 2014-07-26 22:56:17 +00:00
Amith Yamasani
da466e1e91 am 8a8c5f4d: am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen 
* commit '8a8c5f4d305d0dad0f051af32914b07012bfc6a4':
  Hidden global setting to allow adding users from lockscreen
 2014-07-26 01:11:09 +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
Sandeep Siddhartha
0e2594b37c am 4c96adaa: am 678883cc: am 5940eb3a: Fix various bugs with model management 
* commit '4c96adaa1ec3c225fc7e57078787d88709456914':
  Fix various bugs with model management
 2014-07-26 00:30:25 +00:00
Sandeep Siddhartha
eb3cbfeb48 am bac00601: am dc69e6e8: am be52f0d1: Add read/writeBlob to Parcel 
* commit 'bac0060104d359bcc2d745082546c58828bec972':
  Add read/writeBlob to Parcel
 2014-07-26 00:20:40 +00:00
Sandeep Siddhartha
452a642430 Fix various bugs with model management 
- Tie the sound model and keyphrase for simplicity
  We won't support multiple keyphrases in a single model out of the box.
  The db schema will need to be changed by the OEM wishing to add multiple hotwords.
  This is because we currently have no way to test the flow and make sure that things work well with multiple keyphrases
  and also the framework only reads the metadata for one keyphrase.

- Make the delete/update operations atomic

- Make the flow of data from Enrollment -> VIMS; the large sound model doesn't cross the process boundary any other time.
  This is achieved by passing they key around, instead of the model themselves.

- Add a specific delete operation in DatabaseHelper rather than relying on emptying the keyphrases to delete.

Bug: 16555803
Bug: 16516353
Change-Id: I1e0cce137517502a669e431ca7e9f9f755598328
 2014-07-25 17:11:34 -07:00
Sandeep Siddhartha
90d7a3e996 Add read/writeBlob to Parcel 
These are {@hide}en for now.

Bug: 16516353
Change-Id: Ie1635617ee8611a78be9068a7ce674e34c30301d
 2014-07-25 16:50:41 -07:00
ztenghui
29e2dd95fd am 5b942f14: am 6038139c: am ed2a502c: Merge "API REVIEW: VectorDrawable" into lmp-dev 
* commit '5b942f1430bc5bf6ee35455919b7985d8fdefdc2':
  API REVIEW: VectorDrawable
 2014-07-25 23:42:46 +00:00
Jay Civelli
cdd5fe98b6 Revert "Add new intent to prompt user for their device credential. DO NOT MERGE" 
Breaks the JavaDoc generation.

This reverts commit c82a11573810ed4d1f40568d19afc27f726829af.

Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
 2014-07-25 23:42:07 +00:00
Dake Gu
3480d903f2 am af735ebc: am e1b3883c: am 5a5ae1f2: fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator 
* commit 'af735ebc45a0042f9fc7efb948a254bed00cfdd3':
  fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
 2014-07-25 23:25:16 +00:00
Michael Wright
c1fe1251ab am 4b4473aa: am 5f3eb6ca: am 5239ebe3: Add missing documentation for createVirtualDisplay 
* commit '4b4473aa4f9db4eb93c439bcbd7dbb7af886c0ed':
  Add missing documentation for createVirtualDisplay
 2014-07-25 23:13:46 +00:00
Ruben Brunk
da39e96bff am 10d7edab: am ddb65f32: am b4b65247: camera2: Update preview counter after request completed. 
* commit '10d7edabfbc4b7fbe9183671768fbe2f49780031':
  camera2: Update preview counter after request completed.
 2014-07-25 23:13:42 +00:00
Sreeram Ramachandran
b2049de027 am 5c478c04: am f87f2fc6: am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev 
* commit '5c478c04a0fa4391d07b50bd460e2b63bb3a138b':
  Implement support for bypassable VPNs.
 2014-07-25 23:13:22 +00:00
Fabrice Di Meglio
37acb3a8ab am c07199cc: am d009491e: am 09370607: Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker 
* commit 'c07199cc93ac525a39787b8228961ad43a165126':
  Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
 2014-07-25 23:13:18 +00:00
Dake Gu
f03c139018 fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator 
b/16575308

Change-Id: Ieb4f15a8ead7da9682c97d4d342cd77e0b85e5f8
 2014-07-25 23:10:51 +00: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
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
Dake Gu
cf1899fd5c am dde32310: am 575e0a7f: am 3c54a06e: ExitTransitionCoordinator: suppressLayout during running transition 
* commit 'dde323105a6ff02b7d771ed74dfb62ecea3cf7c2':
  ExitTransitionCoordinator:  suppressLayout during running transition
 2014-07-25 22:32:47 +00:00