Commit Graph

39057 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
John Spurlock
486c89842f am 58981510: am cbdadc7d: am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev
* commit '58981510296ed03f9deee0829461bfe76647996b':
  Volume: Persist unsafe volume playback time.
2014-07-25 22:27:40 +00:00
Dake Gu
f7ff2205d9 ExitTransitionCoordinator: suppressLayout during running transition
b/16570734

Change-Id: I52d7132b91256085aa9e535575e978a6031fb276
2014-07-25 22:18:57 +00:00
Yorke Lee
acaf686488 am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
  Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:57:43 +00:00
Jeff Sharkey
e12a125972 am cf85d14e: am bf9964cb: am e52581f6: Offer force-dex-opt when running as root.
* commit 'cf85d14e12824bb51631b2a8d8cd79ff0d0e26fb':
  Offer force-dex-opt when running as root.
2014-07-25 21:26:42 +00:00
Chris Craik
9537c26c3b am 96b6d247: am b5c4634e: am 63582f46: Move ClipBounds to native
* commit '96b6d247b717804e5a994e0d43ee903875e18c73':
  Move ClipBounds to native
2014-07-25 21:18:54 +00:00
Jeff Brown
0f208eb707 Remove DozeHardware since it will not be used.
Bug: 16516536
Change-Id: I14597d3c9470c94e3bc5b8cff500d2fe6b2fd977
2014-07-26 15:41:21 -07:00
ztenghui
a95c8abb36 API REVIEW: VectorDrawable
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource

More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.

TODO:
-- Remove clipToPath, since that should happen on build break Friday.

bug:16488254

Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
2014-07-25 23:26:41 +00:00
John Spurlock
f7ce0125a3 am 4a65634b: am 08e7eb03: am ec2b8cb3: Merge "Volume: Show safe media warning in settings." into lmp-dev
* commit '4a65634b3638e1b324ee8899785ab0e86a36778c':
  Volume: Show safe media warning in settings.
2014-07-25 21:13:29 +00:00
Jeff Sharkey
20e0c50f60 Offer force-dex-opt when running as root.
Recently we removed the PackageManager inotify triggers, meaning the
only supported ways of installing apps were:

-- adb install -r Foo.apk
-- adb shell stop && adb sync && adb shell start

Iterating on most system apps (like Settings) can use the first
approach, but it doesn't work for "persistent" processes like
SystemUI.  (ActivityManager is very particular about how it deals
with persistent apps, and it always sticks with the first
ApplicationInfo found at boot.)

So to enable rapid iteration on persistent apps, we now offer the
one missing piece of forcing a dexopt with a new pm force-dex-opt
command only available to -eng or -userdebug builds.  Typical use
for iterating on persistent apps now looks like this:

$ mmm frameworks/base/packages/SystemUI/ && adb sync &&
    adb shell pm force-dex-opt com.android.systemui &&
    adb shell kill `pid systemui`

Yay!

Change-Id: I0ae2467f1d7cda56c70ba20953cd25fa8ee766ff
2014-07-25 21:11:47 +00:00
Chris Craik
a753f4c6cb Move ClipBounds to native
bug:15698973

Also simplifies RenderNode LTRB properties

Change-Id: I09263a697b71d325a46b57cd5250a2b165f251c8
2014-07-25 20:56:50 +00:00
Alan Viverette
0ef12ae0a5 am aa7deddf: am 86706558: am e1af5ff0: Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev
* commit 'aa7deddf21ca2bf3b0f5175dc302f8c50dab31f9':
  Remove duplicate Toolbar method for setting content description
2014-07-25 20:21:19 +00:00
Dake Gu
c9bd94c23d am 36cedde3: am 986078ff: am 29a67def: Merge "TransitionSet: fix excludeTarget not working" into lmp-dev
* commit '36cedde35de11c9bd2085adcac26bd1943ad1cd6':
  TransitionSet: fix excludeTarget not working
2014-07-25 19:42:45 +00:00