Jeff Sharkey
b6e0c6301d
am db6753cf: am a8d0a3ae: am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
...
* commit 'db6753cf2d8994edcc3e9e488a6be4e2f8ca397a':
Include splits in dumpsys package output.
2014-12-02 01:25:34 +00:00
Jesse Hall
c46ac588e3
am 954b325b: am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
...
* commit '954b325bc3e30a08f41117d85aea4b7f802401f4':
Avoid overwriting EGL14.EGL_NO_SURFACE
2014-12-02 01:25:27 +00:00
Ihab Awad
3380f49618
am 8ea0d19f: am 93b42924: Merge "Fix immutability bug in http://ag/587241 " into lmp-mr1-dev
...
* commit '8ea0d19fe2522ceaf5f09808b7835deb9e53c88a':
Fix immutability bug in http://ag/587241
2014-12-02 01:19:31 +00:00
Ihab Awad
8ea0d19fe2
am 93b42924: Merge "Fix immutability bug in http://ag/587241 " into lmp-mr1-dev
...
* commit '93b429247673bb8e019fe9d39b46700fc86c3313':
Fix immutability bug in http://ag/587241
2014-12-02 01:11:32 +00:00
Ihab Awad
93b4292476
Merge "Fix immutability bug in http://ag/587241 " into lmp-mr1-dev
2014-12-02 01:00:09 +00:00
Ihab Awad
90e34e324c
Fix immutability bug in http://ag/587241
...
Bug: 18292176
Change-Id: Icf1f717d76f042d9950a1d8cca9def061de1c1b8
2014-12-02 00:59:09 +00:00
Adam Powell
35bed6fd4e
am 920c27b2: am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
...
* commit '920c27b24aada088aae0b9644fcf5519575e0433':
Make work profile apps easier to pick in ResolverActivity
2014-12-02 00:56:48 +00:00
Jeff Sharkey
db6753cf2d
am a8d0a3ae: am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
...
* commit 'a8d0a3ae602bb455e290ca1ee6f18184c30f8dc7':
Include splits in dumpsys package output.
2014-12-02 00:51:28 +00:00
Adam Powell
920c27b24a
am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
...
* commit '4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51':
Make work profile apps easier to pick in ResolverActivity
2014-12-02 00:50:39 +00:00
Jesse Hall
954b325bc3
am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
...
* commit '9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
Avoid overwriting EGL14.EGL_NO_SURFACE
2014-12-02 00:48:33 +00:00
Adam Powell
4cd577f0ac
Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
2014-12-02 00:46:01 +00:00
Jeff Sharkey
a8d0a3ae60
am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
...
* commit '2705387df6f3ffe87b2a3a71a48eea7e2be44fb1':
Include splits in dumpsys package output.
2014-12-02 00:45:44 +00:00
Adam Powell
88831a2a6f
Make work profile apps easier to pick in ResolverActivity
...
Pull the "Work" profile item up out of the main list and into the
header of the resolver drawer, making it easier to discover and access
without disrupting the sort order of the list.
Bug 17935301
Change-Id: Id2d081b61828352c998e517127132f883a20b7ef
2014-12-01 16:43:31 -08:00
Jesse Hall
9dec9e9d65
am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
...
* commit '1ee377764a59d0e2c245dd037006fa8c086f5683':
Avoid overwriting EGL14.EGL_NO_SURFACE
2014-12-02 00:42:23 +00:00
Jeff Sharkey
2705387df6
Merge "Include splits in dumpsys package output." into lmp-mr1-dev
2014-12-02 00:39:48 +00:00
Christopher Tate
0832667b4e
am dac93ba2: am 4bdf266c: am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
...
* commit 'dac93ba27e655d01a00cf15320e9f6bfe6fc1c82':
Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:36:04 +00:00
Jeff Sharkey
c4d05fc0db
Include splits in dumpsys package output.
...
Describe the currently installed splits, both in normal dumpsys
output and in checkin output. Also include revisionCode of those
splits when defined (non-zero).
Bug: 18576300
Change-Id: Ie8140961fb7b9e0ed23fd6bc267157aab075dd78
2014-12-01 16:35:20 -08:00
Jesse Hall
1ee377764a
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
2014-12-02 00:35:12 +00:00
Dongwon Kang
993f81e238
TIF: fix a race condition when TvInputManager is initialized
...
Currently, TvInputManagerService notifies the initial state of each
input via TvInputManagetCallback#onInputStateChanged after TvInputManager
is created. However, this is racy because the client may call methods
like getTvInputState() before the initialization.
This patch makes sure that the client gets the control when the initialization
finishes completely.
Bug: 18419452
Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
2014-12-02 09:30:57 +09:00
Christopher Tate
dac93ba27e
am 4bdf266c: am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
...
* commit '4bdf266c03d92448ae65ec31355588d17d179a98':
Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:30:40 +00:00
Christopher Tate
4bdf266c03
am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
...
* commit 'c70fc4a32016f3f06aa80596a7d9b4e9614e78bc':
Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:24:03 +00:00
Christopher Tate
c70fc4a320
Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
2014-12-02 00:18:44 +00:00
Alan Viverette
002f918cea
Only send haptic events from time picker when time changes
...
BUG: 18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
2014-12-01 16:13:32 -08:00
dcashman
11277ca790
am 6ec2cbd8: am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
...
* commit '6ec2cbd8d2b26714d5771e5560bdd2b5b042287b':
Prevent EntropyMixer from registering with service manager.
2014-12-02 00:06:41 +00:00
Michael Wright
3a8d9171fd
am 7dedb124: am 6b35af89: am c859b85c: Merge "Added Razer USA, Ltd serval"
...
* commit '7dedb1242567061b5651c671a221185b1ba901c8':
Added Razer USA, Ltd serval
2014-12-02 00:06:36 +00:00
dcashman
6ec2cbd8d2
am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
...
* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f':
Prevent EntropyMixer from registering with service manager.
2014-12-01 23:59:50 +00:00
Michael Wright
7dedb12425
am 6b35af89: am c859b85c: Merge "Added Razer USA, Ltd serval"
...
* commit '6b35af89f0ce612307d89a45c7fadab3e6e269f3':
Added Razer USA, Ltd serval
2014-12-01 23:59:44 +00:00
Zhijun He
e09dcdba71
ImageReader: free direct byte buffers once Image is returned
...
This can prevent apps from accessing an image byte buffer when it is closed.
Bug: 12528089
Change-Id: I04dccf1832204be2ae3aeb3bbe04f616886447e6
2014-12-01 23:57:11 +00:00
Luan Nguyen
0eb0c9944c
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
...
Bug:17392020
Change-Id: I668cd0766a216786b019425474b0bb36c6e12443
2014-12-01 15:56:11 -08:00
dcashman
c25cfc57e0
am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
...
* commit '24d02652bf8df12a41acf500d958109ef3d99b9a':
Prevent EntropyMixer from registering with service manager.
2014-12-01 23:54:11 +00:00
Michael Wright
6b35af89f0
am c859b85c: Merge "Added Razer USA, Ltd serval"
...
* commit 'c859b85cb530e608da775bb18744a996483a0311':
Added Razer USA, Ltd serval
2014-12-01 23:54:04 +00:00
Yuncheol Heo
b557195c5d
am 96af2bd7: am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.
...
* commit '96af2bd77a9bf80799d681bfd05351df04ee69f4':
CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:51:38 +00:00
dcashman
24d02652bf
Merge "Prevent EntropyMixer from registering with service manager."
2014-12-01 23:49:26 +00:00
Michael Wright
c859b85cb5
Merge "Added Razer USA, Ltd serval"
2014-12-01 23:47:37 +00:00
Chris Craik
faa79ff9d9
Clip outline to View clip bounds for shadow computation
...
bug:18509823
This allows animations of View clipBounds (and other callers of
setClipBounds) to affect shadows, instead of leaving them floating.
Change-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8
2014-12-01 15:47:10 -08:00
Yuncheol Heo
96af2bd77a
am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.
...
* commit '1d22f99da94f131c8047870a8c090b39630f5069':
CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:45:07 +00:00
Yuncheol Heo
1d22f99da9
am f1702487: CEC: make it sure to send vendor commands when changing a setting.
...
* commit 'f17024873b10dabed069e502030dd85d6257c0c4':
CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:39:17 +00:00
Etan Cohen
fbedecc099
MSIM IMS: convert to phone ID based selection.
...
Bug: 18576822
Change-Id: I2a756782ccdab5e4d10193c593cf89a7aa4fcda4
2014-12-01 23:30:58 +00:00
John Reck
816fa6bf57
am b3d75303: am 2bec5766: am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
...
* commit 'b3d75303e81ce7496bf82c74424471c670d496a2':
Prevent calling GL functions with an invalid surface
2014-12-01 22:56:35 +00:00
Yuncheol Heo
f17024873b
CEC: make it sure to send vendor commands when changing a setting.
...
- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.
Bug: 18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
2014-12-02 07:52:16 +09:00
John Reck
b3d75303e8
am 2bec5766: am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
...
* commit '2bec576627c1df95b7dae1bc65d250215218f175':
Prevent calling GL functions with an invalid surface
2014-12-01 22:49:09 +00:00
John Reck
2bec576627
am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
...
* commit '76de89820c51c4bc288b440a82374b9d6c806244':
Prevent calling GL functions with an invalid surface
2014-12-01 22:44:32 +00:00
Andrew Lee
80fff3c0a5
Rename VoLTE capability to HD audio.
...
This is a more specific and less technology-specific title for
communicating this to Dialer/InCall.
Bug: 18103173
Change-Id: I70ad50bb09eb807a621259976bb9fb7953a9a8aa
2014-12-01 14:42:16 -08:00
John Reck
76de89820c
Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
2014-12-01 22:39:31 +00:00
Christopher Tate
a7e47d5d34
Don't crash if a system restore fails before constructing the PMBA
...
If a whole-system restore operation failed at just the wrong point,
we'd wind up in the teardown code without a certain vital bit of it
having been initialized, and crash on the null pointer. Now we
recognize this failure mode and make sure not to do that.
Bug 18574450
Change-Id: Ifa2c10ce16bb3c6bc916ed7151c5fd51b7225691
2014-12-01 14:37:28 -08:00
Alan Viverette
c883153d64
am b08a028d: am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit 'b08a028da62895ae646f129c15c61e8dda955175':
Fix visible rect computation for views with padding
2014-12-01 22:24:15 +00:00
Alan Viverette
b08a028da6
am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit '23dc05634d7bc4a1d436b27dc4cd8bc518834e49':
Fix visible rect computation for views with padding
2014-12-01 22:18:58 +00:00
Alan Viverette
23dc05634d
am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit 'e6bd61d5bbea012b6b80c8bff915042f615630bc':
Fix visible rect computation for views with padding
2014-12-01 22:12:44 +00:00
Alan Viverette
e6bd61d5bb
Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
2014-12-01 22:06:13 +00:00
Ihab Awad
0fe87f68d1
am 97f65689: am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
...
* commit '97f656899924d5494497b5e88d854f0657e4d54d':
Fix to a compatibility patch that was missed in ag/587241
2014-12-01 21:52:47 +00:00