drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,206 Commits 1 Branch 0 Tags
Commit Graph

148206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
e78824fda7 am caffb908: Merge "Fix registering global priority sessions" into lmp-dev 
* commit 'caffb9088f126dcb85fb17a868617b9604cc29b6':
  Fix registering global priority sessions
 2014-08-12 16:41:43 +00:00
Selim Cinek
3c14b49cf2 am 18cfb2a8: Merge "Fixed a bug where a notification had no background" into lmp-dev 
* commit '18cfb2a861fd321d27ede37f8f2a53c967ab485d':
  Fixed a bug where a notification had no background
 2014-08-12 16:04:12 +00:00
Robin Lee
4ed80f1e85 am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs 
* commit '40bdb1f7b345968b98bc710e8304ea69f560b4b9':
  Clean up DevicePolicyManager CA certificate APIs
 2014-08-12 16:04:07 +00:00
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs 
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
 2014-08-12 16:54:40 +01:00
George Mount
ad2d57073a am 0fb5d38b: Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 
* commit '0fb5d38b78554cafb055e00a10b0dfd50a878026':
  Pass elevation to enable shadow in shared elements.
 2014-08-12 14:39:22 +00:00
Sungsoo Lim
5d688caf64 am de4084d3: Add equals method of TvContentRating 
* commit 'de4084d34c1ef070a6b0da918d9809aca8b14f59':
  Add equals method of TvContentRating
 2014-08-12 14:26:22 +00:00
Sungsoo Lim
1681ac0b69 Add equals method of TvContentRating 
Bug: 16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
 2014-08-12 22:48:28 +09:00
Jaewan Kim
3c6b48a1a0 am 1de7bb2d: Merge "Treat empty subrating as the same as null subratings." into lmp-dev 
* commit '1de7bb2d0d82817083b12e71f9907e26371c7eb9':
  Treat empty subrating as the same as null subratings.
 2014-08-12 13:32:30 +00:00
Sungsoo Lim
3e39146c8b am a1424732: Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev 
* commit 'a14247320ee1bf3aee15ad71068e52a8dea88a58':
  Add version attribute in tv_content_rating_system.xml
 2014-08-12 13:06:18 +00:00
Selim Cinek
5748fcffce am df178596: Merge "Fixed a ordering bug with the notification shade" into lmp-dev 
* commit 'df17859676ea70cbd0ab03c3dcdce28737661377':
  Fixed a ordering bug with the notification shade
 2014-08-12 12:46:20 +00:00
Selim Cinek
93f6b7ef54 am c294cdf1: Fixed a jump in the stack scroller algorithm 
* commit 'c294cdf1972f39375fa934a8ee2552a20c3b9258':
  Fixed a jump in the stack scroller algorithm
 2014-08-12 12:11:15 +00:00
Selim Cinek
4581cf8206 Fixed a jump in the stack scroller algorithm 
The bottom stack jumped slightly when scrolling in landscape.

Bug: 16954513
Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e
 2014-08-12 10:50:55 +00:00
Yuncheol Heo
132c72b76c am 2f980820: Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 
* commit '2f98082046884b754bc4e7c89c46f2999a2e8b8a':
  Use the system property for the HdmiControlService configuration.
 2014-08-12 08:52:19 +00:00
Wonsik Kim
62cb2f8963 am 85e21042: Merge "TIF: small refactoring around audio configuration update" into lmp-dev 
* commit '85e21042150ce0a7903807685b0973812b4d81c4':
  TIF: small refactoring around audio configuration update
 2014-08-12 08:52:14 +00:00
Jinsuk Kim
879e9eac74 am daafdbb1: Merge "CEC: Fix two bugs" into lmp-dev 
* commit 'daafdbb10f4c35824a3e35ecb14d9f8759e0688b':
  CEC: Fix two bugs
 2014-08-12 07:10:08 +00:00
Jungshik Jang
934733df4e am 663006eb: Merge "Set active port path to HdmiControlService" into lmp-dev 
* commit '663006ebab102cd66fe4fc8318ca69b0d8810a68':
  Set active port path to HdmiControlService
 2014-08-12 05:29:30 +00:00
Amit Mahajan
7915e1b3fc am 19341807: Revert "add apn setting parameters, and set apn parameters to bp" 
* commit '193418074ad85878121776ebf316367ad53d2039':
  Revert "add apn setting parameters, and set apn parameters to bp"
 2014-08-12 05:23:07 +00:00
Jinsuk Kim
15ccc2d33a am c7410e7c: Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 
* commit 'c7410e7cad4c919dbf6301373de437d6559a4016':
  CEC: Make sure CEC switch info is always updated
 2014-08-12 05:16:26 +00:00
Amit Mahajan
ff2efd5299 Revert "add apn setting parameters, and set apn parameters to bp" 
This reverts commit 3fd217b3f492c95c8550da2a36fffbc6f3a3b724.

Change-Id: Icf32debc07b858c5ae2eb8a7bf4a6e95445a7466
 2014-08-12 05:14:36 +00:00
George Mount
8d2ba6dac3 Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 2014-08-12 04:17:55 +00:00
Jeff Davidson
ed28f122f9 am b44d70ab: Merge "Security-related cleanup for network scoring." into lmp-dev 
* commit 'b44d70abf1ffc57faf16482d24f48247a0c547f2':
  Security-related cleanup for network scoring.
 2014-08-12 03:43:00 +00:00
Ihab Awad
8ced27287a am 09c8e122: Merge "Fix incorrect connection ID for remote connection service" into lmp-dev 
* commit '09c8e1222eef1bedaad6e980bde25d216884bee0':
  Fix incorrect connection ID for remote connection service
 2014-08-12 03:35:06 +00:00
Barnaby James
5e9e5890d7 am 475b1098: Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 
* commit '475b10980cfd608fe808ca95bc005f852cddef05':
  Fix VoiceInteractionService.isActiveService().
 2014-08-12 02:43:21 +00:00
Jeff Sharkey
5c08d6dbd9 am dd28d64f: Merge "Hack and ship: NetworkStats edition." into lmp-dev 
* commit 'dd28d64fa41c81a8968bd0eaf0a36bbb2bb21629':
  Hack and ship: NetworkStats edition.
 2014-08-12 02:37:29 +00:00
Jungshik Jang
316b078e27 am 421e88b7: Merge "Hook up native mhl api to HdmiControl Service." into lmp-dev 
* commit '421e88b7296511be45cf0cd2799500b40188d7a2':
  Hook up native mhl api to HdmiControl Service.
 2014-08-12 02:37:23 +00:00
Chelsea Derrick
f6043b14f4 am 7ec2600c: Merge "Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"" into lmp-dev 
* commit '7ec2600c39f8d7e91b14f59dc15af480deee7e85':
  Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"
 2014-08-12 02:25:32 +00:00
Hui Wang
9a542ca804 am 3fd217b3: add apn setting parameters, and set apn parameters to bp 
* commit '3fd217b3f492c95c8550da2a36fffbc6f3a3b724':
  add apn setting parameters, and set apn parameters to bp
 2014-08-12 01:02:33 +00:00
Hui Wang
fdd78e06a7 add apn setting parameters, and set apn parameters to bp 
Change-Id: I2720b6f8eba707691b9c3f481b6182c98ae3f10b
 2014-08-12 00:44:40 +00:00
John Spurlock
a24cb1f959 am 1a38c8b1: Talkback: Ensure TTS stream is not affected by ringer mode. 
* commit '1a38c8b12ac99cd23fbee37cc15021e782fefbe3':
  Talkback: Ensure TTS stream is not affected by ringer mode.
 2014-08-12 00:44:02 +00:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition. 
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
 2014-08-11 18:40:23 -07:00
John Spurlock
77e54d905f Talkback: Ensure TTS stream is not affected by ringer mode. 
Now that the policy for tablets and phones are unified, follow
the same policy when deciding which streams are never affected
by ringer mode.

Bug:16885683
Change-Id: Iaf526b391de9f429cb9e99ec18a417108443acf6
 2014-08-12 00:22:44 +00:00
Jeff Brown
cafae0c176 am e333f8d4: Eliminate power manager latency for boot completed. 
* commit 'e333f8d4e13eb653073cd7b3965f9d579c90076a':
  Eliminate power manager latency for boot completed.
 2014-08-12 00:18:55 +00:00
Jeff Brown
6d2a9492e2 Eliminate power manager latency for boot completed. 
The power manager disables the power button until boot completed
occurs.  If there are many pending broadcasts in the queue, it
may be possible for BOOT_COMPLETED to be delayed for several
seconds after boot.

To avoid the delay, introduced a new boot phase which is
sent to system services immediately when boot completed happens.

Bug: 13398280
Change-Id: I1833d2ffb20305009dd76363b43e534034f1d0a2
 2014-08-11 17:13:03 -07:00
Etan Cohen
df9c2dc332 am 3855ef4f: Revert "Added debug system property to enable/disable IMS VoLTE/VT." 
* commit '3855ef4f720ca7c1e45a8e2f1117f0528d48dd3f':
  Revert "Added debug system property to enable/disable IMS VoLTE/VT."
 2014-08-12 00:00:01 +00:00
Etan Cohen
77437731a7 Revert "Added debug system property to enable/disable IMS VoLTE/VT." 
Superseded by "Enhanced 4G LTE Mode" official setting.

This reverts commit d32e5aa844307221785bfe64b3a1b7ef36958cbd.
 2014-08-11 23:55:11 +00:00
Jinsuk Kim
fe2704dc51 am b0f3440c: Merge "Move input change event handling out of TVInputManager" into lmp-dev 
* commit 'b0f3440cf143aab7a51ea1005471f7028d5fdec3':
  Move input change event handling out of TVInputManager
 2014-08-11 23:45:34 +00:00
George Mount
36e835679c am 6a2026dc: Merge "Custom snapshot capture and reconstitution." into lmp-dev 
* commit '6a2026dc9fc215bdc1f61e1401faf1d58438f658':
  Custom snapshot capture and reconstitution.
 2014-08-11 23:13:51 +00:00
Jeff Davidson
ac7285dc1e Security-related cleanup for network scoring. 
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
 2014-08-11 15:46:20 -07:00
George Mount
26c82b6ed1 Pass elevation to enable shadow in shared elements. 
Bug 15932772

Change-Id: Ia4cb89035244656a2dd24936bf0e36a5b7970ea6
 2014-08-11 15:38:56 -07:00
RoboErik
5749414e01 am d409105c: Remove sessions listeners that are disabled 
* commit 'd409105c3c054a59811db409d4beb3ec016dcfab':
  Remove sessions listeners that are disabled
 2014-08-11 22:38:51 +00:00
RoboErik
7aef77bbf5 Remove sessions listeners that are disabled 
Removes sessions listeners when their notification listener is
disabled. Also updates the dump for media sessions.

bug:15549450

Change-Id: Ibe51a4a42ef333e75a09f0fffa0f2b9b8939b85c
 2014-08-11 22:32:55 +00:00
Selim Cinek
b6aabdc868 am 36eb886a: Fixed a bug in the notification stack algorithm 
* commit '36eb886a78bca130a512163bc314c57f6cdeb574':
  Fixed a bug in the notification stack algorithm
 2014-08-11 21:10:21 +00:00
Selim Cinek
3afd00e9f2 Fixed a bug in the notification stack algorithm 
Bad holes could occur when a notification was at the same time in
the top and the bottom stack. This also improves the landscape /
smallscreen interaction with the shade.

Bug: 16715133
Change-Id: Icbb4d080e658f4ddbd39b7d08652ca5311a47978
 2014-08-11 20:59:44 +00:00
Geoff Mendal
43af633736 am 80e8ce77: Merge branch \'lmp-dev\' of sso://googleplex-android.git.corp.google.com/platform/frameworks/base into lmp-dev 
* commit '80e8ce77932dc0fce9c60aa951a9c5556ead2683':
 2014-08-11 20:36:11 +00:00
Geoff Mendal
bdfcd08346 am 9c7ea559: Don\'t double count the left/top when using bitmap cache in VectorDrawable. 
* commit '9c7ea559c4692dff0add4af43c13aff59cd7483c':
  Don't double count the left/top when using bitmap cache in VectorDrawable.
 2014-08-11 20:36:06 +00:00
Igor Murashkin
6a44afa666 am 81d6f3e5: camera2: (legacy) Fix the comparison for fixed-focus cameras 
* commit '81d6f3e54c41466bef7a7a908d84d8a29b739cf6':
  camera2: (legacy) Fix the comparison for fixed-focus cameras
 2014-08-11 20:31:55 +00:00
Igor Murashkin
153dc18519 am 66a77b72: camera: (LEGACY) - Add captureIntent and physicalSize metadata 
* commit '66a77b7284b1738fb7406da6088d71d0faa0abd4':
  camera: (LEGACY) - Add captureIntent and physicalSize metadata
 2014-08-11 20:31:51 +00:00
Igor Murashkin
e83d63af78 am b23dea98: camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY 
* commit 'b23dea98da3c8b97669b56d1336dc120a581533b':
  camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
 2014-08-11 20:31:46 +00:00