Commit Graph

42498 Commits

Author SHA1 Message Date
Jeff Davidson
b300f5ee73 am f96b5c61: am c6ddb55c: am 9f920587: Merge "Don\'t request network scores before boot completes." into lmp-dev
* commit 'f96b5c61f7c9b80ee0cb86cf5e1688d7b401e387':
  Don't request network scores before boot completes.
2014-07-30 16:51:50 +00:00
Amith Yamasani
331ae444de am 72735fda: am db231902: am 711c40a2: Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev
* commit '72735fda91d82b8e61dbef9036a28a6890c31c09':
  Potential fix for apps disappearing in launcher on system server crash
2014-07-30 16:51:40 +00:00
Eino-Ville Talvala
fad9cd4746 am a9545b21: am 5496085d: am c02b64b6: Camera2: API review updates
* commit 'a9545b21509c07541a3637dcd1eb34a4c765edc2':
  Camera2: API review updates
2014-07-30 16:51:36 +00:00
Jeff Davidson
8456f49a27 am d823f25a: am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev
* commit 'd823f25a7899ab5203755424a80a605ac98ccd8e':
  Add NetworkScoreManager.disableScoring().
2014-07-30 16:51:12 +00:00
Eino-Ville Talvala
abd9d3c5c7 Camera2: API review updates
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
  to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION

Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
2014-07-29 23:30:34 +00:00
Jeff Davidson
acb5b7f084 Merge "Don't request network scores before boot completes." into lmp-dev 2014-07-25 21:16:23 +00:00
Jeff Davidson
505c4a3093 Don't request network scores before boot completes.
Bug: 16655123
Change-Id: If6696635c59f6494e6232c3a75d283a2cbce2798
2014-07-29 16:18:04 -07:00
Amith Yamasani
204e80485f Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
ad97b8b905 Potential fix for apps disappearing in launcher on system server crash
Throw RuntimeException to launcher if there was a RemoteException
from LauncherAppsService. This matches the behavior of previous
calls that were made to PackageManager that could have resulted
in a RemoteException if the system server was dying/dead.

Bug: 15687732
Change-Id: Ifda3fda209141b361a286fc033217acfa0ec196e
2014-07-29 16:25:17 -07:00
Jinsuk Kim
b2b3151a42 Send TV app the intent for the new active source
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device. For non-CEC devices or MHL device
the device info comes with port ID only, which should be used to find
the right input.

Change-Id: I71c8454fead037d880ee440b0a8d64dd361ed558
2014-07-29 22:41:57 +00:00
Igor Murashkin
ffdfcd7f27 Merge "camera2: legacy: Don't set the @hide frame number metadata" into lmp-dev 2014-07-25 21:16:23 +00:00
Igor Murashkin
56678d8778 camera2: legacy: Don't set the @hide frame number metadata
Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5
2014-07-29 15:14:57 -07:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-29 15:09:45 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
2014-07-29 14:20:41 -07:00
Igor Murashkin
3f2757a305 Merge changes I104c8243,I82811142 into lmp-dev
* changes:
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
2014-07-25 21:16:23 +00:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay.
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
2014-07-29 07:27:52 -07:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
2014-07-29 21:06:29 +00:00
Jeff Davidson
1561fd3b06 Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 2014-07-24 16:56:49 +00:00
Jeff Davidson
26fd143326 Add NetworkScoreManager.disableScoring().
Allows the active scorer app to disable itself.

Change-Id: I7bcdc3aafb95af4ea0b110b01b08ab4daf7a137f
2014-07-29 16:03:19 -07:00
George Mount
964c3cf5b2 Add default propagation back to Explode.
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
2014-07-29 14:13:00 +00:00
Jon Miranda
0615026ba1 Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 2014-07-24 15:36:21 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
2014-07-29 20:46:40 +00:00
Jon Miranda
4597e98069 Exposed getLocationOnScreen, added formatToHexString method.
In order to use the ExportedProperty annotation, I needed a public non-void
method which is why I created a new "public int[] getLocationOnScreen()."

The formatToHexString method is used to convert an int or byte to a hex string
prefixed with "0x". I set the value to true on these flags: mGravity,
mPrivateFlags, mSystemUiVisibility, mViewFlags, mGroupFlags, mMarginFlags,
and flags.

Change-Id: I5914992ba19b80643dfcc6caa487398452e18cbc
2014-07-29 07:25:49 -07:00
Adrian Roos
489d2dfc29 Fix checkbuild
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
2014-07-29 20:30:50 +00:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
2014-07-29 12:49:50 -07:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
2014-07-29 11:34:35 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code"
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
2014-07-29 11:30:35 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
2014-07-29 11:24:51 -07:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel()
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
2014-07-29 11:11:41 -07:00
Jason Monk
9a090e6ded Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 2014-07-25 23:00:08 +00:00
Jason Monk
8863b57e89 Fix incorrect Activity#startLockTask doc
It referenced a swipe down gesture that doesn't exist.  This should
be more safe, and cover other devices as well.

Bug: 16626273
Change-Id: I907b25a00d903f9f36ca335d3a75c1f8f931d50e
2014-07-29 13:49:32 -04:00
Alan Viverette
216d3e6d81 Add better errors for unresolved attributes, remove unused code
Change-Id: Icf81a81b9ce97b5a5edff85569e6e3da93149436
2014-07-29 10:35:42 -07: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
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
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
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
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
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