OSDN Git Service
Rich Slogar [Fri, 19 Jun 2015 16:25:36 +0000 (16:25 +0000)]
am
a519cb67: am
f56a440d: am
e9abb682: am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
a519cb676672f5e8f9da7e1bd64f67d4fc6d9d88':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 16:25:29 +0000 (16:25 +0000)]
am
f4cc2628: am
01e5cf9d: am
940335ba: Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
* commit '
f4cc262847fb17f3aecd85c0b7d09e05ed937b8c':
Wear doesn't need Shell to send notification when bugreport captured.
Rich Slogar [Fri, 19 Jun 2015 16:14:01 +0000 (16:14 +0000)]
am
f56a440d: am
e9abb682: am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
f56a440dea73e03472fffb4b4435e0038c646dcb':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 16:13:56 +0000 (16:13 +0000)]
am
01e5cf9d: am
940335ba: Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
* commit '
01e5cf9ddffa2d2b11d2c8ece58ab4f734a597d9':
Wear doesn't need Shell to send notification when bugreport captured.
Shawn Willden [Fri, 19 Jun 2015 14:18:34 +0000 (14:18 +0000)]
am
bb399afc: am
687b3259: am
09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
* commit '
bb399afc52375cdadcc1a68ef9032b0957e9f47b':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
Selim Cinek [Fri, 19 Jun 2015 14:18:28 +0000 (14:18 +0000)]
am
2f35f155: am
6cd8d30d: am
a353528c: Merge "Added a message to the keyguard bouncer" into mnc-dev
* commit '
2f35f155d356dd17a6359e35da9058180b497761':
Added a message to the keyguard bouncer
Adam Lesinski [Fri, 19 Jun 2015 14:18:23 +0000 (14:18 +0000)]
am
8542a49d: am
024d8e2f: am
8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
* commit '
8542a49d06b6bfbe80190bc86c76269d4c085b17':
BatteryStats: Update external stats individually.
Adam Lesinski [Fri, 19 Jun 2015 14:18:16 +0000 (14:18 +0000)]
am
67426b40: am
6be9d0de: am
d2b9dcac: Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
* commit '
67426b4081bc76b30b5c18188989a1cfa5ae158e':
BatteryStats: Log when WiFi idle time is too large
Christopher Tate [Fri, 19 Jun 2015 14:18:10 +0000 (14:18 +0000)]
am
f45835bf: am
92f8cff8: am
3233a0a6: Merge "Don\'t always dump domain/preferred state" into mnc-dev
* commit '
f45835bf149aecaa169d2ff6a713371831aa8bb1':
Don't always dump domain/preferred state
Sanket Padawe [Fri, 19 Jun 2015 14:18:04 +0000 (14:18 +0000)]
am
2142d570: am
460a2925: am
30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
* commit '
2142d5704ab651e3108c4e6f6b4d2464c40af9d4':
Set default PBAP checkbox state to false (checkbox unselected).
Dianne Hackborn [Fri, 19 Jun 2015 14:17:59 +0000 (14:17 +0000)]
am
50bf0203: am
1594edce: am
0348ba2e: Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '
50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
Fix issue #
20494208: Go out of device idle when headset button is pressed
Adam Lesinski [Fri, 19 Jun 2015 14:17:52 +0000 (14:17 +0000)]
am
9f0179cc: am
a0578a02: am
00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit '
9f0179cc5f6f74a6b9957f60526353898f02ac0b':
BatteryStats: Fix regression in wakelock power distribution
Dan Sandler [Fri, 19 Jun 2015 14:17:45 +0000 (14:17 +0000)]
am
2a0cc6cf: am
7a7e8fc8: am
11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
* commit '
2a0cc6cf4dc61e03d5bb5348177cca95aeb0257d':
Announce chronometers with time-unit words.
Santos Cordon [Fri, 19 Jun 2015 14:17:39 +0000 (14:17 +0000)]
am
42c93a18: am
b32fe52c: am
fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev
* commit '
42c93a18bbdcdfba7cc2b2bb690bb33726a5b06c':
Clean up SIM CallManager APIs.
Fyodor Kupolov [Fri, 19 Jun 2015 14:17:33 +0000 (14:17 +0000)]
am
322e14fe: am
bf591b89: am
7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit '
322e14feea35132d56ad5d7d3f0c7908bb0cdcfa':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Pierre Vandwalle [Fri, 19 Jun 2015 14:17:26 +0000 (14:17 +0000)]
am
8a55a5ad: am
7c74c944: am
0b00db8e: Merge "create Wifi PNO ALARM intent" into mnc-dev
* commit '
8a55a5ade28ac4622a4ca2b60106280c23cd66e7':
create Wifi PNO ALARM intent
Fyodor Kupolov [Fri, 19 Jun 2015 14:17:20 +0000 (14:17 +0000)]
am
d171cabc: am
01caa29a: am
e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev
* commit '
d171cabc2c5c132547e20b30928df95876e9217f':
Defer writes to runtime-permissions.xml
Doris Liu [Fri, 19 Jun 2015 14:17:15 +0000 (14:17 +0000)]
am
4eeee310: am
59c82ee3: am
707ae538: Merge "Fix a typo in Drawable\'s javadoc" into mnc-dev
* commit '
4eeee3102e5051028a17527b3ddee5b29d25dc7f':
Fix a typo in Drawable's javadoc
Yang Ni [Fri, 19 Jun 2015 14:17:06 +0000 (14:17 +0000)]
am
d6909748: am
44095579: am
159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit '
d6909748d39e17f6dfb42c219ee8344e2d1a59a7':
Unpublish methods in class ScriptGroup.Binding
Todd Kennedy [Fri, 19 Jun 2015 14:17:00 +0000 (14:17 +0000)]
am
bd626dd9: am
24cd7b03: am
f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit '
bd626dd96d25033812e7d3aa528d63fafc96cb0d':
Add getPackageImportance() system API
Jeff Sharkey [Fri, 19 Jun 2015 14:16:54 +0000 (14:16 +0000)]
am
282bbbc4: am
e5ab13b6: am
c8a49a2b: Merge "Write packages.list when granting permissions." into mnc-dev
* commit '
282bbbc4358f4e18c7da60397a6f939173048d55':
Write packages.list when granting permissions.
Alan Viverette [Fri, 19 Jun 2015 14:16:48 +0000 (14:16 +0000)]
am
83cea0d4: (-s ours) am
afc21d72: am
f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit '
83cea0d44e6a95a0a624717a99ef3dae0f383ade':
DO NOT MERGE: Remove DayNight theme
Paul McLean [Fri, 19 Jun 2015 14:16:42 +0000 (14:16 +0000)]
am
3f16c819: am
fcff4c38: am
2d5f41e4: Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
* commit '
3f16c819a6b4f6aa0d8417331f6a5b1dc065dfa4':
Better handling of 0-length format conversions in convertAudioPortFromNative().
Alan Viverette [Fri, 19 Jun 2015 14:16:36 +0000 (14:16 +0000)]
am
7da029d5: am
ed113f18: am
b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
* commit '
7da029d5d0631425f63ea944c52f58fbf2976475':
Ensure ResolverDrawerLayout is visible to accessibility services
Shawn Willden [Fri, 19 Jun 2015 13:59:03 +0000 (13:59 +0000)]
am
687b3259: am
09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
* commit '
687b32591b29442a5c2d181e7acd72a94ce93eab':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
Selim Cinek [Fri, 19 Jun 2015 13:58:55 +0000 (13:58 +0000)]
am
6cd8d30d: am
a353528c: Merge "Added a message to the keyguard bouncer" into mnc-dev
* commit '
6cd8d30d8341006a38c08e39eb5b9ef7b88d22ba':
Added a message to the keyguard bouncer
Adam Lesinski [Fri, 19 Jun 2015 13:58:47 +0000 (13:58 +0000)]
am
024d8e2f: am
8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
* commit '
024d8e2f49522c661e9fc0afdfa3bf435dc337d0':
BatteryStats: Update external stats individually.
Adam Lesinski [Fri, 19 Jun 2015 13:58:35 +0000 (13:58 +0000)]
am
6be9d0de: am
d2b9dcac: Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
* commit '
6be9d0de34996fd74e679302f6ca439ccec4505c':
BatteryStats: Log when WiFi idle time is too large
Christopher Tate [Fri, 19 Jun 2015 13:58:30 +0000 (13:58 +0000)]
am
92f8cff8: am
3233a0a6: Merge "Don\'t always dump domain/preferred state" into mnc-dev
* commit '
92f8cff8e464a93d9036d46967b34055bc015736':
Don't always dump domain/preferred state
Sanket Padawe [Fri, 19 Jun 2015 13:58:25 +0000 (13:58 +0000)]
am
460a2925: am
30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
* commit '
460a2925945009c5e44b053c7cddadcacc9ae9e9':
Set default PBAP checkbox state to false (checkbox unselected).
Dianne Hackborn [Fri, 19 Jun 2015 13:58:20 +0000 (13:58 +0000)]
am
1594edce: am
0348ba2e: Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '
1594edcea1e8862827410f2542d19c5edb403cbe':
Fix issue #
20494208: Go out of device idle when headset button is pressed
Adam Lesinski [Fri, 19 Jun 2015 13:58:09 +0000 (13:58 +0000)]
am
a0578a02: am
00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit '
a0578a025949b0759dbd6109b60c2c560b03b2d5':
BatteryStats: Fix regression in wakelock power distribution
Dan Sandler [Fri, 19 Jun 2015 13:58:04 +0000 (13:58 +0000)]
am
7a7e8fc8: am
11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
* commit '
7a7e8fc83c5b362427aa061002e928ab7f7721cf':
Announce chronometers with time-unit words.
Santos Cordon [Fri, 19 Jun 2015 13:57:52 +0000 (13:57 +0000)]
am
b32fe52c: am
fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev
* commit '
b32fe52c25eac655d7e1979adf0b42f46043181b':
Clean up SIM CallManager APIs.
Fyodor Kupolov [Fri, 19 Jun 2015 13:57:15 +0000 (13:57 +0000)]
am
bf591b89: am
7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit '
bf591b899426617720fff40256b92aee691a9cc5':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Pierre Vandwalle [Fri, 19 Jun 2015 13:57:10 +0000 (13:57 +0000)]
am
7c74c944: am
0b00db8e: Merge "create Wifi PNO ALARM intent" into mnc-dev
* commit '
7c74c944a7c675f0394a784a13f612c668ac59b3':
create Wifi PNO ALARM intent
Fyodor Kupolov [Fri, 19 Jun 2015 13:57:01 +0000 (13:57 +0000)]
am
01caa29a: am
e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev
* commit '
01caa29a870a1f5b27d7758775cbe04da87871b0':
Defer writes to runtime-permissions.xml
Doris Liu [Fri, 19 Jun 2015 13:56:49 +0000 (13:56 +0000)]
am
59c82ee3: am
707ae538: Merge "Fix a typo in Drawable\'s javadoc" into mnc-dev
* commit '
59c82ee3d2fc3a51928738eb3bd44d513efdeb99':
Fix a typo in Drawable's javadoc
Yang Ni [Fri, 19 Jun 2015 13:56:44 +0000 (13:56 +0000)]
am
44095579: am
159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit '
44095579186a59b6856af665a6b30743e35a2b7b':
Unpublish methods in class ScriptGroup.Binding
Todd Kennedy [Fri, 19 Jun 2015 13:56:40 +0000 (13:56 +0000)]
am
24cd7b03: am
f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit '
24cd7b0302b52989236637a0a1451939e635b717':
Add getPackageImportance() system API
Jeff Sharkey [Fri, 19 Jun 2015 13:56:28 +0000 (13:56 +0000)]
am
e5ab13b6: am
c8a49a2b: Merge "Write packages.list when granting permissions." into mnc-dev
* commit '
e5ab13b616d130622098a7c868cae3f94646d9e7':
Write packages.list when granting permissions.
Alan Viverette [Fri, 19 Jun 2015 13:56:23 +0000 (13:56 +0000)]
am
afc21d72: am
f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit '
afc21d72d87390ed0b175c007248c32c5813d1ff':
DO NOT MERGE: Remove DayNight theme
Paul McLean [Fri, 19 Jun 2015 13:56:06 +0000 (13:56 +0000)]
am
fcff4c38: am
2d5f41e4: Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
* commit '
fcff4c382dd0efe37f3e603820bf4a7077b65dba':
Better handling of 0-length format conversions in convertAudioPortFromNative().
Alan Viverette [Fri, 19 Jun 2015 13:55:57 +0000 (13:55 +0000)]
am
ed113f18: am
b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
* commit '
ed113f1848191bf6baf63d00efe2620e7e7d1a35':
Ensure ResolverDrawerLayout is visible to accessibility services
Rich Slogar [Fri, 19 Jun 2015 06:02:58 +0000 (06:02 +0000)]
am
e9abb682: am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
e9abb6829f622c19b8cb14e9f68a0e13a8a93272':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 06:02:54 +0000 (06:02 +0000)]
am
940335ba: Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
* commit '
940335ba5b68f3382d7b42ba4fd781c8120bc370':
Wear doesn't need Shell to send notification when bugreport captured.
Rich Slogar [Fri, 19 Jun 2015 05:58:13 +0000 (05:58 +0000)]
am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
d9d05fe358c96e85149627d955191d1328e9924a':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 05:54:53 +0000 (05:54 +0000)]
Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
Wei Liu [Fri, 19 Jun 2015 05:52:37 +0000 (22:52 -0700)]
resolved conflicts for merge of
1dac6bd9 to mnc-dev
Change-Id: I000b35f5e2658a065c780396254bcb88f1cbce5e
Shawn Willden [Fri, 19 Jun 2015 03:27:42 +0000 (03:27 +0000)]
am
09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
* commit '
096148087980ea5a92e1b96579900ea36727fbbc':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
Shawn Willden [Fri, 19 Jun 2015 03:16:49 +0000 (03:16 +0000)]
Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
Selim Cinek [Fri, 19 Jun 2015 01:51:25 +0000 (01:51 +0000)]
am
a353528c: Merge "Added a message to the keyguard bouncer" into mnc-dev
* commit '
a353528c79e0e295a98a79f8672ace6df8647f78':
Added a message to the keyguard bouncer
Alex Klyubin [Fri, 19 Jun 2015 01:43:45 +0000 (18:43 -0700)]
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
This reflects the changes in
da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.
Bug:
19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
Selim Cinek [Fri, 19 Jun 2015 01:40:37 +0000 (01:40 +0000)]
Merge "Added a message to the keyguard bouncer" into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 01:32:38 +0000 (01:32 +0000)]
am
8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
* commit '
8b156e37d5238487f1b3742fe9fb8a0632bfd66c':
BatteryStats: Update external stats individually.
Adam Lesinski [Fri, 19 Jun 2015 01:22:52 +0000 (01:22 +0000)]
Merge "BatteryStats: Update external stats individually." into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 01:20:08 +0000 (01:20 +0000)]
am
d2b9dcac: Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
* commit '
d2b9dcac7ff3b2aafb3a58bf9ef78945a215a6b0':
BatteryStats: Log when WiFi idle time is too large
Christopher Tate [Fri, 19 Jun 2015 01:20:03 +0000 (01:20 +0000)]
am
3233a0a6: Merge "Don\'t always dump domain/preferred state" into mnc-dev
* commit '
3233a0a65c8bd2acce4b8fdfe6ce8e6c20b9a24d':
Don't always dump domain/preferred state
Adam Lesinski [Fri, 19 Jun 2015 01:17:06 +0000 (01:17 +0000)]
Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
Adam Lesinski [Thu, 18 Jun 2015 21:52:24 +0000 (14:52 -0700)]
BatteryStats: Update external stats individually.
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.
Bug:
21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
Sanket Padawe [Fri, 19 Jun 2015 01:13:09 +0000 (01:13 +0000)]
am
30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
* commit '
30a79ec19064220847f5cdc0e58f83bd4a948930':
Set default PBAP checkbox state to false (checkbox unselected).
Dianne Hackborn [Fri, 19 Jun 2015 01:13:05 +0000 (01:13 +0000)]
am
0348ba2e: Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '
0348ba2e2303d9dce57a6b5d19cc47ecc5089afe':
Fix issue #
20494208: Go out of device idle when headset button is pressed
Christopher Tate [Fri, 19 Jun 2015 01:12:00 +0000 (01:12 +0000)]
Merge "Don't always dump domain/preferred state" into mnc-dev
Christopher Tate [Fri, 19 Jun 2015 01:09:42 +0000 (18:09 -0700)]
Don't always dump domain/preferred state
Change-Id: Ie0431b6c3cb1a9f372a142637359c42b182d4b1b
Adam Lesinski [Fri, 19 Jun 2015 01:05:20 +0000 (18:05 -0700)]
BatteryStats: Log when WiFi idle time is too large
We have issues with bad data coming from the WiFi system, so
log when we have unreasonably large WiFi idle time.
Bug:
21929173
Change-Id: I54b34c5efad14264306155c588f4c3b71cae35df
Sanket Padawe [Fri, 19 Jun 2015 01:03:34 +0000 (01:03 +0000)]
Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
Dianne Hackborn [Fri, 19 Jun 2015 01:01:36 +0000 (01:01 +0000)]
Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 00:59:28 +0000 (00:59 +0000)]
am
00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit '
00fac63575349df5ed8c399b83f1f9c7199ff070':
BatteryStats: Fix regression in wakelock power distribution
Dan Sandler [Fri, 19 Jun 2015 00:59:24 +0000 (00:59 +0000)]
am
11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
* commit '
11859eba4e0e3c8dc1e2479a83e73dff6536ffc7':
Announce chronometers with time-unit words.
Adam Lesinski [Fri, 19 Jun 2015 00:57:46 +0000 (00:57 +0000)]
Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
Sanket Padawe [Fri, 19 Jun 2015 00:56:08 +0000 (17:56 -0700)]
Set default PBAP checkbox state to false (checkbox unselected).
Bug:
20488109
Change-Id: I6259ea8d048cbface2ba63b8c1077af12d0fee1b
Dan Sandler [Fri, 19 Jun 2015 00:50:57 +0000 (00:50 +0000)]
Merge "Announce chronometers with time-unit words." into mnc-dev
Dianne Hackborn [Fri, 19 Jun 2015 00:40:33 +0000 (17:40 -0700)]
Fix issue #
20494208: Go out of device idle when headset button is pressed
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.
Change-Id: Ie58de60e63036a4142881283835961fbcceec892
Santos Cordon [Fri, 19 Jun 2015 00:19:52 +0000 (00:19 +0000)]
am
fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev
* commit '
fe1fdacf1d256f5f1a5020906bc9c400b99a14bb':
Clean up SIM CallManager APIs.
Santos Cordon [Fri, 19 Jun 2015 00:04:58 +0000 (00:04 +0000)]
Merge "Clean up SIM CallManager APIs." into mnc-dev
Rich Slogar [Thu, 18 Jun 2015 23:55:44 +0000 (23:55 +0000)]
am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
docs: sdk-tools 24.3.3 updates
Oleksiy Vyalov [Fri, 12 Jun 2015 20:27:12 +0000 (13:27 -0700)]
Resolve canonical package path before writing it to packages.list.
Bug id - b/
21028929
Change-Id: I82a7ba4f27017d3de29790cdbfab656ca9814cfb
Rich Slogar [Thu, 18 Jun 2015 23:47:27 +0000 (23:47 +0000)]
Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
Rich Slogar [Tue, 16 Jun 2015 21:22:08 +0000 (14:22 -0700)]
docs: sdk-tools 24.3.3 updates
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
Wei Liu [Thu, 18 Jun 2015 23:24:41 +0000 (23:24 +0000)]
am
ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.
* commit '
ae363d2db4398a695606c254b88be8940139edd1':
Wear doesn't need Shell to send notification when bugreport captured.
Fyodor Kupolov [Thu, 18 Jun 2015 23:23:32 +0000 (23:23 +0000)]
am
7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit '
7e603d69947566bd17ac76820fde59ac9fd11c0c':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Pierre Vandwalle [Thu, 18 Jun 2015 23:23:28 +0000 (23:23 +0000)]
am
0b00db8e: Merge "create Wifi PNO ALARM intent" into mnc-dev
* commit '
0b00db8eebd3b677c1d9190061d0d97dd672976e':
create Wifi PNO ALARM intent
Yusuke Sato [Thu, 18 Jun 2015 23:22:47 +0000 (23:22 +0000)]
Merge "Record WM_BOOT_ANIMATION_DONE in WindowManagerService"
Fyodor Kupolov [Thu, 18 Jun 2015 23:16:42 +0000 (23:16 +0000)]
Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
Santos Cordon [Fri, 12 Jun 2015 22:27:01 +0000 (15:27 -0700)]
Clean up SIM CallManager APIs.
Bug:
21499476
Change-Id: Iaded74c6b885b0745dfa85d0b7733bdad75d615a
Pierre Vandwalle [Thu, 18 Jun 2015 23:13:17 +0000 (23:13 +0000)]
Merge "create Wifi PNO ALARM intent" into mnc-dev
Fyodor Kupolov [Thu, 18 Jun 2015 23:09:38 +0000 (23:09 +0000)]
am
e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev
* commit '
e5bce22dc098d5da9ff573f4aac812272de3c0af':
Defer writes to runtime-permissions.xml
Fyodor Kupolov [Thu, 18 Jun 2015 23:00:48 +0000 (23:00 +0000)]
Merge "Defer writes to runtime-permissions.xml" into mnc-dev
Doris Liu [Thu, 18 Jun 2015 22:51:11 +0000 (22:51 +0000)]
am
707ae538: Merge "Fix a typo in Drawable\'s javadoc" into mnc-dev
* commit '
707ae53879b24b49c369419d2cf80c29090d8cb3':
Fix a typo in Drawable's javadoc
Yang Ni [Thu, 18 Jun 2015 22:51:07 +0000 (22:51 +0000)]
am
159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit '
159f442fa3dd620aa91cf390dff8beb9a1141a01':
Unpublish methods in class ScriptGroup.Binding
Todd Kennedy [Thu, 18 Jun 2015 22:51:03 +0000 (22:51 +0000)]
am
f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit '
f29c4a07f42eecb77fbd9acdcf61a26d3480c047':
Add getPackageImportance() system API
Doris Liu [Thu, 18 Jun 2015 22:39:16 +0000 (22:39 +0000)]
Merge "Fix a typo in Drawable's javadoc" into mnc-dev
Yang Ni [Thu, 18 Jun 2015 22:38:58 +0000 (22:38 +0000)]
Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
Todd Kennedy [Thu, 18 Jun 2015 22:37:39 +0000 (22:37 +0000)]
Merge "Add getPackageImportance() system API" into mnc-dev
Jeff Sharkey [Thu, 18 Jun 2015 22:31:46 +0000 (22:31 +0000)]
am
c8a49a2b: Merge "Write packages.list when granting permissions." into mnc-dev
* commit '
c8a49a2b95d6ed182cbc966676d17f98e1ccd816':
Write packages.list when granting permissions.
Alan Viverette [Thu, 18 Jun 2015 22:31:41 +0000 (22:31 +0000)]
am
f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit '
f1da9a1401fe1304bee8a550a0141c79ecc3c0b3':
DO NOT MERGE: Remove DayNight theme
Selim Cinek [Thu, 18 Jun 2015 08:38:59 +0000 (01:38 -0700)]
Added a message to the keyguard bouncer
A message can now be shown on the keyguard bouncer
explaining why the bouncer is being shown.
Bug:
21618072
Change-Id: I25aea9cc242abbf6a133fb42cc4407f5c2f3f688
Doris Liu [Thu, 18 Jun 2015 22:26:17 +0000 (15:26 -0700)]
Fix a typo in Drawable's javadoc
Change-Id: Ic168b250defb30512cb35a836118fe2bdf1b2e78
Todd Kennedy [Thu, 18 Jun 2015 19:54:55 +0000 (12:54 -0700)]
Add getPackageImportance() system API
Callers must have the permission GET_PACKAGE_IMPORTANCE
Bug:
20642684
Change-Id: I6f3ef2ec810c884e0dee239e5909bcb314957302
Jeff Sharkey [Thu, 18 Jun 2015 22:26:55 +0000 (22:26 +0000)]
Merge "Write packages.list when granting permissions." into mnc-dev
OSDN Git Service
