136834 Commits

Author SHA1 Message Date
Zhijun He
83e214ecd6 am 920e79b6: Merge "Camera2: Clarify shading map spec" into lmp-preview-dev
* commit '920e79b680e7329dbbd107da8c9118a763d43f87':
  Camera2: Clarify shading map spec
2014-05-23 00:39:36 +00:00
Zhijun He
6eb03e10b4 Merge "Camera2: Clarify shading map spec" into lmp-preview-dev 2014-05-23 00:35:58 +00:00
Glenn Kasten
1aa74e4bc2 Remove android.media.AudioFormat default constructor
Change-Id: I2fe65ee7a8087151b44da3b84af357ea8bee80c4
2014-05-22 17:13:06 -07:00
Dianne Hackborn
aa90295d20 am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev
* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:
2014-05-23 00:11:11 +00:00
Eino-Ville Talvala
0324a95052 am 7e01420b: Merge "Camera2: New capture session interface" into lmp-preview-dev
* commit '7e01420b8e532694369fc885f83838fc527708dd':
  Camera2: New capture session interface
2014-05-23 00:11:05 +00:00
Jorim Jaggi
c877f6ab11 am 95b404dc: (-s ours) DO NOT MERGE Move clock and top padding while dismissing Keyguard.
* commit '95b404dc1f0c4f74824de401537d51e73d84e6e8':
  DO NOT MERGE Move clock and top padding while dismissing Keyguard.
2014-05-23 00:11:04 +00:00
Ihab Awad
8b15da393a am f346ac3b: (-s ours) DO NOT MERGE. Fix invalid format specifier in log message
* commit 'f346ac3b119b71f083067ee73f03955fdd037035':
  DO NOT MERGE. Fix invalid format specifier in log message
2014-05-23 00:11:04 +00:00
The Android Automerger
b11ee52864 am 0c82c484: merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89
* commit '0c82c484c475422aedf17a8fee5ce3fb1b4290a8': (121 commits)
  am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
  Fixing bugs due to the new custom accessibility action APIs.
  Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
  Fix a runtime break caused by merge conflict
  Fix typo causing immersive mode transition flickering.
  Fix 64 bit long pointer size for media scanning
  fix argument order in call to SkBlurDrawLooper constructor
  Fix recording of wake_lock_in.
  Fix not being able to pull down status bar.
  Add net.dns system properties
  Battery stats more wake history, power save mode.
  Disable texture atlas
  Fix reboot loop due to NPE.
  Quick fix to ensure mipmap doesn't get stripped by AAPT
  Comment out some new netd calls to fix networking.
  Revert "If PackageUsage information is missing, treat as first boot and compile everything"
  Add api for getting the parent of a profile.
  If PackageUsage information is missing, treat as first boot and compile everything
  Allow setting password restrictions from a managed profile.
  Fix badness from proxy refactoring.
  ...
2014-05-23 00:11:04 +00:00
Chris Craik
d490aa4260 Merge "Inspect SkShader to determine hw shader." 2014-05-23 00:03:46 +00:00
Jeff Sharkey
5ec9aed64c Merge "Offer to stream and fsync() install sessions." 2014-05-22 23:52:41 +00:00
Zhijun He
9e6d1880c2 Camera2: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.

Bug: 15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
2014-05-22 16:47:35 -07:00
Dianne Hackborn
caa3abd3d1 Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev 2014-05-22 23:44:12 +00:00
Dianne Hackborn
2932513181 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Zhijun He
fa7c755a92 Camera2: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.

Also fix a typo in tonemap.mode.

Bug: 15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
2014-05-22 16:36:02 -07:00
Griff Hazen
6b7b34849a Merge commit 'e5b73ae2' into manualmerge
Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Jeff Sharkey
78cc340c2d Offer to stream and fsync() install sessions.
Installers are interested in both streaming APK data and establishing
a happens-after relationship to support resuming downloads after a
process kill or battery pull.

This exposes a generic OutputStream for writing, and hooks up flush()
to be a blocking call which returns only when all outstanding write()
data has been fsync()'ed to disk.

Tests to verify behavior.

Bug: 14975160
Change-Id: I38289867c80ac659163bb0c2158ef12d99cc570d
2014-05-22 15:54:16 -07:00
Christoph Studer
60748e7122 SysUI: Implement NotificationListenerService in StatusBar
This is currently disabled by constant that is off.

Bug: 15131411
Change-Id: I0da6e5b3b81c87004f0794d3056c4cf0ecbb1d61
2014-05-22 22:51:15 +00:00
Andrew Solovay
59f61cc23d am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '768a899f214dd2fcf4bf3857549fee81b22debc4':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:50:45 +00:00
Andrew Solovay
768a899f21 am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit 'b59608981ff464b85a26987b8822913e41e72291':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:45:06 +00:00
Vinod Krishnan
eae1e09459 am 810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
* commit '810ed89c244060beefa91470e0fa3d50d679caba':
  Adding activity enter/exit animations for wearables
2014-05-22 22:44:53 +00:00
Aravind Akella
c7153377cf am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit '73da981fd60f9dc855a04ea53e9fff59a011577e':
  Remove getRequiredPermission from NDK.
2014-05-22 22:44:49 +00:00
Nick Vaccaro
1af1371e1b am 117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '117df282017945f3b3f05dc43a6f436d19d3f071':
  Don't grab wakelock if Wifi feature not supported on device
2014-05-22 22:44:44 +00:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Andrew Solovay
b59608981f am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '9562863cf184fe99be223aff9700b3ceb8559e1a':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:41:55 +00:00
Vinod Krishnan
810ed89c24 Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev 2014-05-22 22:39:42 +00:00
Christopher Tate
4e7a225589 Merge "Don't crash uninstalling updates to system apps" 2014-05-22 22:11:06 +00:00
Aravind Akella
73da981fd6 Merge "Remove getRequiredPermission from NDK." into klp-modular-dev 2014-05-22 22:01:23 +00:00
Eino-Ville Talvala
88aca033ff Merge "Camera2: New capture session interface" into lmp-preview-dev 2014-05-22 21:56:55 +00:00
Christopher Tate
f71ece48a1 Don't crash uninstalling updates to system apps
Bug 15167960

Change-Id: I606638292e524078f2859ba6be0a4861a4e01c00
2014-05-22 14:55:11 -07:00
Andrew Solovay
9562863cf1 doc: Updated branding guidelines per request from @deniseamling.
Per her team's request, I also removed the AI version of the Google
Play Store icon, and replaced it with a high-rez PNG version.

Current version of doc is staged at:

http://asolovay.mtv:9010/distribute/tools/promote/brand.html

(Denise gave me a LGTM via email.)

Bug: 14621461

Change-Id: Id44a0dc73c7ef2f2bde595a1e98b75083d126176
2014-05-22 21:54:27 +00:00
Nick Vaccaro
117df28201 Don't grab wakelock if Wifi feature not supported on device
Only grab the suspend wakelock when handling screen on/off
transitions if the device actually supports Wifi.

Bug: 14250726
Change-Id: Ic332cf84e40622ab6bbe60a2288ee478f1cabb2a
2014-05-22 21:48:22 +00:00
Christoph Studer
3e144d3dfc NoMan: Allow SysUI to register as listener
Expand ACL of INotificationManger.registerListener() from
system only to system or SysUI.

Also call onListenerConnected() on listeners connected via
INotificationManger.registerListener().

Bug: 15131411
Change-Id: I8f2ce34325ad72c7740b383de2ebb9fb88dea5d3
2014-05-22 23:45:07 +02:00
Jorim Jaggi
7d16bb1e32 DO NOT MERGE Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
(cherry picked from commit c42bdc3ba9493efe68b9ed39fbd55c84ba175185)
2014-05-22 21:43:46 +00:00
Christoph Studer
71f18fd1b6 SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
(cherry picked from commit 7c96ae873d9a54ebaeb5b7ef21b48224dc42d094)
2014-05-22 21:41:13 +00:00
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Jorim Jaggi
b37637b6fd Merge "Move clock and top padding while dismissing Keyguard." 2014-05-22 21:37:17 +00:00
Santos Cordon
5c013261a9 Merge "Adding ITelecommService definition for Telecomm." 2014-05-22 21:21:41 +00:00
vandwalle
567d3f461b Merge "revert change preventing NULL SSID in a WifiConfiguration" 2014-05-22 20:59:45 +00:00
Eino-Ville Talvala
cca00c614c Camera2: New capture session interface
- Add CameraCaptureSession for all operations that require a
  valid camera configuration
- Deprecate methods in CameraDevice that are moving to CameraCaptureSession
- Document new semantics

Bug: 14964443
Change-Id: I53b2b71ed2b746cfcf76a01483f499765eb5047b
2014-05-22 20:52:36 +00:00
Jae Seo
7752244e47 DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
Added the following columns to the Channels table:
 searchable - Used to hide certain channels from search.
 locked - Used to prevent unauthorized users from watching certain
          channels by requiring passcode.

Added the following columns to the Programs table:
 genre - Used to describe the categorical genre.
 audio_language - Used to list up available audio languages.

Bug: 14833588, Bug: 14123945, Bug: 14069779
Change-Id: Id01483f56ecf3b665e3d4dbcea1a4800ff7f031d
(cherry picked from commit 3532899452d62b6f2cd9250cb48ec204862fb3b2)
2014-05-22 20:46:48 +00:00
Ihab Awad
42b30e1b83 DO NOT MERGE. Fix invalid format specifier in log message
Bug: 15154713
Change-Id: Ia1f45eb568b31f02a7443def0dc9ef32a21e7f02
(cherry picked from commit 8523607b6e4927d034e47681174843f22308e34a)
2014-05-22 20:36:16 +00:00
Aravind Akella
8bcdd9b7a5 Remove getRequiredPermission from NDK.
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
2014-05-22 13:33:52 -07:00
Andrew Solovay
7f24adf19b Merge "Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener." into klp-docs 2014-05-22 20:23:50 +00:00
Jorim Jaggi
afc11f196c Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
2014-05-22 21:58:10 +02:00
Dmitriy Ivanov
c774dcee9d Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
   (hammerhead aosp tot).

Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
2014-05-22 12:40:25 -07:00
Raph Levien
186213f28c Merge "Roboto v2" 2014-05-22 19:37:03 +00:00
Lorenzo Colitti
a8aad1b65f Merge "Fix Ethernet documentation." 2014-05-22 19:22:57 +00:00
Winson Chung
f13cd857e0 Merge "Removing unnecessary public values. (Bug 14995844)" 2014-05-22 19:20:14 +00:00
Aravind Akella
94e4d29eff Merge "Hide Sensor.getRequiredPermission API." 2014-05-22 19:11:53 +00:00