Yorke Lee
488d3f5f4b
am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'b9105f15aa914fcbc10cf414edf2a79ab23c403c':
Add call log entries to all currently running users
2014-07-21 17:05:27 +00:00
Yorke Lee
0d6b31426b
am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'ec0197dae050d48b803b803b082d619925306fc0':
Add call log entries to all currently running users
2014-07-21 17:01:15 +00:00
Derek Sollenberger
e1bb46bd7f
am 61cc70a2: am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '61cc70a2c21e32c6e6d0f0c909c85bf8b1095d3e':
Separate Canvas JNI code from the implementation.
2014-07-21 16:49:23 +00:00
Derek Sollenberger
22c0fc66b0
am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '521830a79ba1e56429b31607a4c5af990cd76542':
Separate Canvas JNI code from the implementation.
2014-07-21 16:45:15 +00:00
Robert Ly
c16f3f6354
am d93a4d1b: am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'd93a4d1bae3713a518b3b3bc7ddcfe4f22b8994c':
docs: change copy for edu video
2014-07-21 16:30:06 +00:00
Robert Ly
acee769c0b
am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '077d56225b53ef152474e0aed27fe4010139fe01':
docs: change copy for edu video
2014-07-21 16:26:43 +00:00
Robert Ly
fb06b4800c
am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '205196f128b13eecea2789506341c7ecd2044b71':
docs: change copy for edu video
2014-07-21 16:22:12 +00:00
Robert Ly
205196f128
am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa
am 62c81ab5: docs: change copy for edu video
...
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
docs: change copy for edu video
2014-07-21 16:11:39 +00:00
Adrian Roos
3a6bebf38d
am 4f5106e7: am c1c28902: More user switching goodness
...
* commit '4f5106e7a69d2c4893e7b7492948ab377682a8be':
More user switching goodness
2014-07-21 16:09:27 +00:00
Robert Ly
62c81ab580
docs: change copy for edu video
...
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
2014-07-21 09:06:50 -07:00
Adrian Roos
a08d5acf33
am c1c28902: More user switching goodness
...
* commit 'c1c28902038844c608d06692df74b2886d41fc6f':
More user switching goodness
2014-07-21 16:04:49 +00:00
Adrian Roos
5005244f10
More user switching goodness
...
- Confirmation when exiting guest
- Dialog when resuming existing guest session (will be HUNed in follow-up CL)
- Properly center user name in QS user switcher
Bug: 15759638
Bug: 16378966
Change-Id: I63a1dd524975408618c10d90a18052f15deec756
2014-07-21 15:54:03 +00:00
Craig Mautner
38c1a5f5a9
am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
...
* commit 'b7bb95b0f3cd8b2ccb61cfa75a586fe1df1be123':
Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 15:36:37 +00:00
Craig Mautner
b7bb95b0f3
am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
...
* commit '02fd104f303cb7d55d6af42be8fe7be543e9aba5':
Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 15:31:38 +00:00
Dan Sandler
5854500459
am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '00c3f554f17f0a82f0feca9013de804426c149de':
Defend against null ApplicationInfos.
2014-07-21 13:21:57 +00:00
Dan Sandler
7505947b6c
am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '8bfa8dbccfa178344485450be8b388efcc29d88d':
Defend against null ApplicationInfos.
2014-07-21 13:17:23 +00:00
Dan Sandler
09afc2e4ea
Defend against null ApplicationInfos.
...
Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
2014-07-21 13:11:17 +00:00
Wonsik Kim
f8f1c49e7a
am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '39ac147e42ccaf1fc5450fc81572231a7e6b3449':
TIF: fix indexOfValue usage
2014-07-21 13:05:03 +00:00
Wonsik Kim
ae0ee247ed
am caed0312: am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev
...
* commit 'caed03128dec1dd521a9ca1ed19ff60f89d8d868':
TIF: fix tvInputType attribute to match with TvInputInfo
2014-07-21 13:04:59 +00:00
Wonsik Kim
0b9a52cfb3
am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '20c790cf711b4930f24eb031c4a5839aeb1a441f':
TIF: fix indexOfValue usage
2014-07-21 13:01:06 +00:00
Wonsik Kim
5ee9fa5f4f
am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev
...
* commit 'acbd8d4a6cc0d256980897cfe641ab6bb66ae6bb':
TIF: fix tvInputType attribute to match with TvInputInfo
2014-07-21 13:01:02 +00:00
Adrian Roos
3f5d82bb8d
am 35e21d40: am a727db86: Update LockPatternUtils to new alarm API
...
* commit '35e21d40ee1f219d9e44654ffdadf96bf85f69c7':
Update LockPatternUtils to new alarm API
2014-07-21 12:40:23 +00:00
Niels Egberts
bf471288c1
am 1eb446a5: am 7a925857: New TtsSpan builders for money, electronic and telephone.
...
* commit '1eb446a5e0636d3269a667007c3bb64596263d56':
New TtsSpan builders for money, electronic and telephone.
2014-07-21 12:40:19 +00:00
Jungshik Jang
e2879e5977
am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev
...
* commit '13dc029e32c3a8fbe1e87dfa0387ad303b0e83ba':
Add two apis for one touch record.
2014-07-21 12:40:15 +00:00
Ji-Hwan Lee
d6dbca92c0
am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
...
* commit '1dc7352eacde37dac5459f0bc82c868e9548b521':
TIF: Extend multiple TV input per service for HDMI logical devices
2014-07-21 12:40:10 +00:00
Santos Cordon
1a2b69ef00
am 5cafb03d: am e0cd9db8: Change telecomm APIs from protected to public (1/3)
...
* commit '5cafb03dbcb55b50bcf81a0eea41263c25d7a9ef':
Change telecomm APIs from protected to public (1/3)
2014-07-21 12:40:06 +00:00
Jungshik Jang
35fb483a8f
am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
...
* commit 'a86a6f2c03959cb5a2d5fbde96fdf42246ab43de':
Do no send <Feature Abort> as response of <Feature Abort>
2014-07-21 12:40:02 +00:00
Jinsuk Kim
b018fd8d96
am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
...
* commit 'd4a48882cca68b99cc4336257b831ccdd8ec6e6d':
Invoke callback for HdmiControlService.deviceSelect() for internal source
2014-07-21 12:39:58 +00:00
Joe Onorato
40f11f3d62
am 98de561e: am c35149b2: Move android.bluetooth and android.telephony to framework2.jar.
...
* commit '98de561e774b78904f23bbaed1e23f12596e6ac9':
Move android.bluetooth and android.telephony to framework2.jar.
2014-07-21 12:39:54 +00:00
Jinsuk Kim
27da640f12
am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
...
* commit 'e51029b9046dfbb15f1e72ad7a20d5959fa79ee9':
TIF: Register IHdmiInputChangeListener to physical input manager
2014-07-21 12:39:49 +00:00
Jesse Hall
2785e352de
am c623c94c: am 65c75169: Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev
...
* commit 'c623c94c0f4c823f4f33a2ce37b706277ce621bc':
Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
2014-07-21 12:39:45 +00:00
Santos Cordon
e9f0b379ad
am 9f825c78: am 6a30817e: Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev
...
* commit '9f825c78661fb95997d55748f8361ad094af93e5':
Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
2014-07-21 12:39:41 +00:00
Jae Seo
a725e79325
am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()
...
* commit '0e29adb65b8eea3092370862db329eac195bcd35':
TIF: Add sendAppPrivateCommand()
2014-07-21 12:39:37 +00:00
Evan Charlton
8a3807266a
am 4c47b196: am e524ae5d: Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev
...
* commit '4c47b19666fb15d8096979cab9bf93cdb949d280':
@hide CAPABILITY_CALL_PROVIDER
2014-07-21 12:39:34 +00:00
Santos Cordon
a9f5c52067
am 2f8900b1: am 829308f7: Rename InCallCall to ParcelableCall (1/2)
...
* commit '2f8900b1415f142af331f8ea89833a9064a31fd9':
Rename InCallCall to ParcelableCall (1/2)
2014-07-21 12:39:29 +00:00
Evan Charlton
4af329b585
am c248975a: am d9e0bfee: Merge "Rename setDestroy() to destroy()" into lmp-dev
...
* commit 'c248975a162abed2d1e2584ddda677d5753f9d7b':
Rename setDestroy() to destroy()
2014-07-21 12:39:25 +00:00
Santos Cordon
169e9e2f18
am d6afd919: am c27a00a0: Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev
...
* commit 'd6afd91969f1fd9425a623144523eec2a7be0ea3':
Change incoming call intent to a TelecommManager method. (1/3)
2014-07-21 12:39:21 +00:00
Jean-Michel Trivi
47a0e8294b
am b3c1aa30: am 1b6c240b: Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev
...
* commit 'b3c1aa300beeb1ff7ab544f8d991be001bde0b0d':
Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
2014-07-21 12:39:17 +00:00
Adrian Roos
c41eebb723
am a727db86: Update LockPatternUtils to new alarm API
...
* commit 'a727db864c3e555c073d908a85d4c6ebc6eb2303':
Update LockPatternUtils to new alarm API
2014-07-21 12:32:47 +00:00
Niels Egberts
96a211d898
am 7a925857: New TtsSpan builders for money, electronic and telephone.
...
* commit '7a9258578fdd249a2697e03503f9d824a22042db':
New TtsSpan builders for money, electronic and telephone.
2014-07-21 12:32:44 +00:00
Jungshik Jang
21f585aae6
am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev
...
* commit '7506f4c99c34ce23bc878a28ec5cbfb86945057c':
Add two apis for one touch record.
2014-07-21 12:32:30 +00:00
Ji-Hwan Lee
8b2d3fa6b7
am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
...
* commit 'd0f94173ed237c28b35e0ea6d307f3ff885f6bd2':
TIF: Extend multiple TV input per service for HDMI logical devices
2014-07-21 12:32:26 +00:00
Santos Cordon
0056a96d05
am e0cd9db8: Change telecomm APIs from protected to public (1/3)
...
* commit 'e0cd9db865af87d660daedc8f53682dcde0f658f':
Change telecomm APIs from protected to public (1/3)
2014-07-21 12:32:23 +00:00
Jungshik Jang
8503293004
am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
...
* commit '9d42d1f3d11412e3186eee4eec00e7ce26973531':
Do no send <Feature Abort> as response of <Feature Abort>
2014-07-21 12:32:19 +00:00
Jinsuk Kim
6b52a82aa4
am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
...
* commit '2a1ff5ad3835a6380375608c20a8fc5d90a9aa38':
Invoke callback for HdmiControlService.deviceSelect() for internal source
2014-07-21 12:32:16 +00:00
Joe Onorato
8a6c4a1d95
am c35149b2: Move android.bluetooth and android.telephony to framework2.jar.
...
* commit 'c35149b2c89eec32d446df15deb5978f6aea9d3b':
Move android.bluetooth and android.telephony to framework2.jar.
2014-07-21 12:32:12 +00:00
Jinsuk Kim
2185b0f47b
am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
...
* commit '1e6393b8184da92184acc1f23060cd75d210a6a2':
TIF: Register IHdmiInputChangeListener to physical input manager
2014-07-21 12:32:09 +00:00
Jesse Hall
9c489752ef
am 65c75169: Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev
...
* commit '65c7516997a05a63ed0e682c36c2b163f5ea4882':
Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
2014-07-21 12:32:03 +00:00
Santos Cordon
58bd044a0c
am 6a30817e: Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev
...
* commit '6a30817eea7b5f7bb669b2aebf16f2ee0d03d32c':
Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
2014-07-21 12:31:59 +00:00