Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,573 Commits 3 Branches 0 Tags
a3b59dbfc2f3dd68f27a46bb6ff6f1cc3defe7ff
Commit Graph

8348 Commits

Author SHA1 Message Date
Chris Wren
a3b59dbfc2 am 7d902825: am 4ba63196: am 949c6e3a: Expose headsUpContentView so developers can customize it. 
* commit '7d902825399fbba5c84a62292305e844ca0ad9a5':
  Expose headsUpContentView so developers can customize it.
 2014-08-01 20:50:34 +00:00
Sungsoo Lim
3f8ddc51fc am bf1c5722: am 6d376986: am eb77c228: Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev 
* commit 'bf1c5722801bcecfcf030ff4c80e694d1814b325':
  TIF: Use XML file for representing TvContentRating
 2014-08-01 20:50:25 +00:00
Sungsoo Lim
087a6fe30e am d1ea6778: am 2df78bef: am 05df1176: Merge "Revert "Service data and manufacturer data can be repeated fields."" into lmp-dev 
* commit 'd1ea67785d6b6d2c9b86f5037257d523252bf4e6':
  Revert "Service data and manufacturer data can be repeated fields."
 2014-08-01 20:49:54 +00:00
Wei Wang
12f013dfa1 am bc61cadd: am 61e6c1e0: am 1d5fcf03: Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 
* commit 'bc61cadd12b6bc2a4ea396d97a23efe9fae4aa37':
  Service data and manufacturer data can be repeated fields.
 2014-08-01 20:49:45 +00:00
Sandeep Siddhartha
47607d07ea am f6a30eb6: am b8265920: am b8ffb28e: Merge "Tighten the checks around a detector being invalidated" into lmp-dev 
* commit 'f6a30eb6f86a16d5dae1ad392c5a08292e7f446a':
  Tighten the checks around a detector being invalidated
 2014-08-01 20:49:35 +00:00
Jeff Sharkey
96f0c8dd4f am 2b7fc490: am cc2e3136: am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev 
* commit '2b7fc490a7a2844ea2978b174eab34cb83e64b8b':
  Persist install sessions, more lifecycle.
 2014-08-01 20:49:25 +00:00
George Mount
23785adfe9 am b3bd029b: am dab97bb2: am 044a7d67: Add differentiating transitions for returning/reentering. 
* commit 'b3bd029b5ab2df8c86ab903bc597f858298be157':
  Add differentiating transitions for returning/reentering.
 2014-08-01 20:49:16 +00:00
Chris Wren
97c0b90f89 Expose headsUpContentView so developers can customize it. 
Bug: 13510114
Change-Id: I645c204e366fefab58224d2e67d00e701dc661aa
 2014-08-01 10:57:05 +00:00
George Mount
68f96d8db5 Add differentiating transitions for returning/reentering. 
Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
 2014-07-31 21:58:06 +00:00
Jae Seo
484da7eb5f am e05ae199: am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit. 
* commit 'e05ae199c403c1ea399e81fbeed1d4bc9b7854e1':
  TIF: Make TvTrackInfo methods more explicit.
 2014-07-31 13:41:59 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair. 
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
 2014-07-31 09:30:13 +01:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit. 
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
 2014-07-31 16:15:51 +09:00
Lorenzo Colitti
87dffdd02b am 9200a867: am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '9200a867a71b02c0147b0a9670f1e141d398aa43':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:11:12 +00:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs. 
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
 2014-07-31 02:17:28 +00:00
Shishir Agrawal
81f10dbd01 am b169a41e: am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit 'b169a41e409ee6e62dc3c9403fd5a7129f921a23':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:22:35 +00:00
destradaa
d2cf9d98da am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:51:17 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Alan Viverette
4bfbac82e4 am 72cb9b21: am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '72cb9b21a3fc4173b42f85c052c0dee2fd137ac2':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:35:26 +00:00
keunyoung
176ded3d62 am 4e8e785e: am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4e8e785e2b7f58de656c7d473dcedd96c1a91e80':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:35:18 +00:00
Ye Wen
fad65f5394 am 54f3bf70: am 13f2726f: am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev 
* commit '54f3bf7043f0856a2064f1286a5e83da7130cca9':
  Move archived column from pdu/sms to threads (1/4)
 2014-07-30 20:27:02 +00:00
Wei Wang
76f3cceea6 Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 2014-07-29 22:44:51 +00:00
Wei Wang
3f7a39063a Service data and manufacturer data can be repeated fields. 
b/16635899

Change-Id: I73f1f4effd3f0e38cd427297eb9d22f3ba285d61
 2014-07-31 15:43:05 -07:00
Alan Viverette
46359204a8 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171 Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
 2014-07-30 13:37:35 -07:00
keunyoung
1d0a7ccd00 add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode 
- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
 2014-07-30 14:12:34 -07:00
Christoph Studer
3d5e26d659 am 09473140: am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '0947314029aa6c40f875703356a9c06417d356a8':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:45:02 +00:00
Sandeep Siddhartha
9a576f2174 am 041b0b6e: am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit '041b0b6ef8cd61014c5d00e05e0c2d322d675c42':
  Make startRecognition async
 2014-07-30 19:15:02 +00:00
Shishir Agrawal
a122e8df74 Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager. 
The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
 2014-07-30 18:09:53 -07:00
Jeff Sharkey
ceb2adca49 Merge "Persist install sessions, more lifecycle." into lmp-dev 2014-07-25 23:00:08 +00:00
Jeff Sharkey
1cb2d0d4bb Persist install sessions, more lifecycle. 
To resume install sessions across device boots, persist session
details and read at boot.  Drop sessions older than 3 days, since
they're probably buggy installers.

Add session callback lifecycle around open/close to give home apps
details about active installs.  Also give them a well-known intent
to show session details.

Extend Session to list staged APKs and open them read-only, giving
installers a mechanism to verify delivered bits, for example using
MessageDigest, before committing.

Switch to generating random session IDs instead of sequential.

Defensively resize app icons if too large.  Reject runaway
installers when they have too many active sessions.

Bug: 16514389
Change-Id: I66c2266cb82fc72b1eb980a615566773f4290498
 2014-07-31 15:17:03 -07:00
ztenghui
9f0fbaee64 am 1aa0970e: am 3520c8a9: am da818af6: API Review: VectorDrawable. Remove clipToPath, add MiterLimit 
* commit '1aa0970e75158557b032cf7bfc8db778debffbab':
  API Review: VectorDrawable. Remove clipToPath, add MiterLimit
 2014-07-30 17:17:16 +00:00
Yorke Lee
91f0295c8d am 9b5e2dd5: am 9dfe2c4d: am f4c289dc: Merge "ContactsContract API changes" into lmp-dev 
* commit '9b5e2dd5abbb46d07b3633010124cfef521816fe':
  ContactsContract API changes
 2014-07-30 17:11:20 +00:00
Kenny Guy
868428460a am 1c694e7e: am 39dbf079: am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev 
* commit '1c694e7e746766822e0c55548a01dca652f73264':
  Add optional handler to LauncherApps callback
 2014-07-30 16:53:42 +00:00
Jae Seo
9e96af9848 am a6377bb1: am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager 
* commit 'a6377bb178192f54a761325ff951a59cacd1d6e6':
  TIF: Merge TvParentalControlManager into TvInputManager
 2014-07-30 16:53:00 +00:00
Jae Seo
59016be39c am 3a4781a0: am f38c8185: am af0f27fa: TIF: Use more consistent constant names 
* commit '3a4781a03bb9fcdec71f39c0020f339cd99d67fa':
  TIF: Use more consistent constant names
 2014-07-30 16:52:56 +00:00
Aravind Akella
bb9e3ee435 am 8b9de74e: am 05f855b4: am 1fde001f: Merge "SensorManager API changes." into lmp-dev 
* commit '8b9de74e2bd522c5f97c64f7c085bfc0f8508053':
  SensorManager API changes.
 2014-07-30 16:52:31 +00:00
Tyler Gunn
a71e4c040c am 5388708b: am edeba32e: am c5d8facb: Adding video width/height to camera capabilities. 
* commit '5388708ba147432131bddc0d62f9372de3cd3410':
  Adding video width/height to camera capabilities.
 2014-07-30 16:52:14 +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
ztenghui
d511fc2fa4 API Review: VectorDrawable. Remove clipToPath, add MiterLimit 
bug:16488254

Change-Id: I693fd46eaf9af016ea9cefe44b559e0aee7c8f03
 2014-07-30 16:47:19 +00:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager 
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
 2014-07-30 15:39:39 +09:00
Jae Seo
6e62a1508c TIF: Use more consistent constant names 
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
 2014-07-30 11:46:41 +09:00
Tyler Gunn
5d231e1343 Adding video width/height to camera capabilities. 
Bug: 16602621
Bug: 16573836
Change-Id: Idaca4b6d889bf7910fcc37bee7ef478e2fbe3af3
 2014-07-30 00:07:46 +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
Aravind Akella
6fc1901b1a Merge "SensorManager API changes." into lmp-dev 2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3 SensorManager API changes. 
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
     ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
 2014-07-29 17:41:02 -07:00
Yorke Lee
38e2d104d8 Merge "ContactsContract API changes" into lmp-dev 2014-07-25 23:00:08 +00:00
Yorke Lee
94c8761dc5 ContactsContract API changes 
* Make ContactCounts an interface
* Improve clarity of ContactCounts documentation
* Add PinnedPositions.undemote method, and hide the method name
constant that is only used for the internal implementation

Bug: 16403306

Change-Id: If8b5cad779293cb9a3b90e698b13481f79b2351f
 2014-07-29 19:00:32 -07:00
Sungsoo Lim
3776ce3949 Merge "Revert "Service data and manufacturer data can be repeated fields."" into lmp-dev 2014-07-25 11:19:20 +00:00
Sungsoo Lim
67c01a4b6d Revert "Service data and manufacturer data can be repeated fields." 
This reverts commit 26dc9b99b17ca9d8ce3632c48e8b6c1450ee53e9.

Change-Id: I1846d0a6491c5b2ba5905411bd98f5d17909b705
 2014-08-01 01:24:14 +00:00
Ihab Awad
edeb0d2104 Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev 2014-07-27 22:35:46 +00:00