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

156908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
46b4920ac8 Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev 2014-10-21 18:14:50 +00:00
Alan Viverette
2efbe9816e Fix gradient drawable radius when specified as float, dimension 
BUG: 18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
 2014-10-21 11:04:04 -07:00
Ye Wen
2cb65604bc Send HTTP status code back in case of MMS HTTP failure (1/3) 
We need this in SMS app so that we can treat 404 specially

b/17520290

Change-Id: Ifae1c1b323411143c740fb589c2b978b5ff9bc4e
 2014-10-21 10:58:06 -07:00
Andrew Lee
8f8e473cac Fire onConferenceChanged after reseting conference. 
Bug: 17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
 2014-10-21 10:32:49 -07:00
John Spurlock
7bbb9f6410 Sysui: Include shared prefs in service dump. 
Also:
 - Remove obsolete Prefs helper.
 - Use common file for zen-mode prefs.

Bug: 18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
 2014-10-21 12:26:45 -04:00
Adrian Roos
7b4a38b197 Delay discovery of system trust agents 
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.

Bug: 18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
 2014-10-21 17:07:41 +02:00
Leon Scroggins III
e463bc388e am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit '3c8bde5534d81518f5baf3795989f367373f7dfd':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-21 13:56:42 +00:00
Leon Scroggins III
3c8bde5534 Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 2014-10-21 13:52:30 +00:00
Robin Lee
fc56790085 am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-21 11:58:38 +00:00
Robin Lee
e1c9489cc4 Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 2014-10-21 11:54:52 +00:00
Geoff Mendal
0359259318 am a9a550dd: (-s ours) am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a9a550dd8e87b33979670cf856838ba227500547':
  Import translations. DO NOT MERGE
 2014-10-20 23:51:31 +00:00
Geoff Mendal
a9a550dd8e am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'deddb38462389823c194559052c4d64ee6c3b467':
  Import translations. DO NOT MERGE
 2014-10-20 23:43:33 +00:00
Geoff Mendal
deddb38462 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:39:58 +00:00
Geoff Mendal
e8d005429c Import translations. DO NOT MERGE 
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
 2014-10-20 16:21:14 -07:00
Jinsuk Kim
6ec9b4f09b am 17e9d246: Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 
* commit '17e9d2468fea360ab17679161f31cf6a38198fc7':
  CEC: Add missing protections for some HdmiControlService API
 2014-10-20 22:56:20 +00:00
Jinsuk Kim
17e9d2468f Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 2014-10-20 22:50:37 +00:00
Leon Scroggins III
91332e7eca Report that a JavaInputStreamAdaptor is at end. 
This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
 2014-10-20 22:49:35 +00:00
RoboErik
c5109b1ffe am 01c9d330: am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '01c9d330b76e17076a1d71019344c2b859a1eb2c':
  Add missing break to switch statement
 2014-10-20 22:25:49 +00:00
Amit Mahajan
15803d4ace am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit '1213bf83e96bf9a3747a90d84969038b9ad76971':
  Add a constant for invalid profile id value
 2014-10-20 22:21:26 +00:00
RoboErik
01c9d330b7 am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
  Add missing break to switch statement
 2014-10-20 22:19:54 +00:00
Amit Mahajan
1213bf83e9 Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 2014-10-20 22:17:39 +00:00
Jinsuk Kim
b22d9ee0a3 CEC: Add missing protections for some HdmiControlService API 
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.

Bug: 17408780

Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
 2014-10-21 07:14:46 +09:00
RoboErik
f0a284115a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
 2014-10-20 22:14:10 +00:00
RoboErik
2fa604fc59 Merge "Add missing break to switch statement" into lmp-dev 2014-10-20 22:08:07 +00:00
RoboErik
59759903a9 Add missing break to switch statement 
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
 2014-10-20 14:56:32 -07:00
Griff Hazen
22b1113e0b am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit '6e1eb1c96680ee9b51ca3f6a4ebd29711cfb5927':
  Disable zen log printouts by default
 2014-10-20 21:50:02 +00:00
Wei Wang
1217c2b2db am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '2959231c78fb890907e4dc6cf232f1d64ef37bcf':
  Remove spammy log information for BLE scan.
 2014-10-20 21:49:58 +00:00
smain@google.com
8f481f4fdb am 3f256d52: am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit '3f256d52952630887bfa04c8cef44a099b8a2615':
  Doc change: misc changes to highlights.
 2014-10-20 21:49:53 +00:00
Griff Hazen
6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default
 2014-10-20 21:46:12 +00:00
Wei Wang
2959231c78 am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
  Remove spammy log information for BLE scan.
 2014-10-20 21:46:08 +00:00
smain@google.com
3f256d5295 am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit 'ae6dc92c3d39862e97a778ea69943ee37a78e92b':
  Doc change: misc changes to highlights.
 2014-10-20 21:46:00 +00:00
Griff Hazen
aec92e2eca Merge "Disable zen log printouts by default" into lmp-sprout-dev 2014-10-20 21:43:16 +00:00
Alan Viverette
f81c6af10e Propagate state changes even when we don't change drawable index 
Previously we could miss the state change if we were simply reversing the
current transition.

BUG: 17967405
Change-Id: I2cb396dedbff61b980741ef8c0d931be6abe129c
 2014-10-20 14:42:53 -07:00
Wei Wang
33bb6c2d3c Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 2014-10-20 21:41:29 +00:00
smain@google.com
ae6dc92c3d am 21de5f3f: Doc change: misc changes to highlights. 
* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
  Doc change: misc changes to highlights.
 2014-10-20 21:40:11 +00:00
smain@google.com
21de5f3f12 Doc change: misc changes to highlights. 
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
 2014-10-20 14:34:22 -07:00
Wink Saville
f4d86a1dd9 am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit 'f44628e3133a6bffd225836b1fff23cd827938a7':
  Radio Capability Support.
 2014-10-20 21:29:29 +00:00
Wink Saville
f44628e313 am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
  Radio Capability Support.
 2014-10-20 21:24:27 +00:00
Wink Saville
6bacccbfbc Merge "Radio Capability Support." into lmp-sprout-dev 2014-10-20 21:17:29 +00:00
Adam Lesinski
d3969d927e am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:10:09 +00:00
Adam Lesinski
6dfe03ae6c am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:05:04 +00:00
Griff Hazen
1aad144c8f Disable zen log printouts by default 
Bug: 18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
 2014-10-20 14:02:59 -07:00
Adam Lesinski
73a8c5962d am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:00:23 +00:00
Adam Lesinski
3f8c7dec6b Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 2014-10-20 20:55:48 +00:00
Robin Lee
e69bdca44b DevicePolicy: Restore CA warning to K behaviour 
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.

Bug: 17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
 2014-10-20 20:55:40 +00:00
ztenghui
8c857eec74 am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '12d808a24f4af9a127ae851edd06339b77020178':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:48:05 +00:00
ztenghui
12d808a24f am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit 'a724d1ab4083f08958bd88e76e15b7c0af337bfc':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:42:51 +00:00
ztenghui
a724d1ab40 am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:35:58 +00:00
ztenghui
877ce2c42b Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev 2014-10-20 20:29:17 +00:00
John Spurlock
c8a01f353e am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit '3babc728e0910ac25744bdf3f923fdfdeeb689d1':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:20:25 +00:00