OSDN Git Service
Bryan Mawhinney [Thu, 7 Jul 2016 09:28:03 +0000 (09:28 +0000)]
Merge \"Make MediaScanner extract \"date taken\" from videos, if present\" into nyc-mr1-dev
am:
d63dbfdb6b
Change-Id: I5ea0eafbc2e122f2756098ac98b50c03fe773be5
Bryan Mawhinney [Thu, 7 Jul 2016 09:22:43 +0000 (09:22 +0000)]
Merge "Make MediaScanner extract "date taken" from videos, if present" into nyc-mr1-dev
Hugo Benichi [Thu, 7 Jul 2016 09:13:22 +0000 (09:13 +0000)]
Merge \"IpConn metrics: add times to DHCP bound state\" into nyc-mr1-dev
am:
bbf97cd121
Change-Id: I0002c00d03165ac4bfa4a9790984d9e5615d7ff4
TreeHugger Robot [Thu, 7 Jul 2016 09:06:44 +0000 (09:06 +0000)]
Merge "IpConn metrics: add times to DHCP bound state" into nyc-mr1-dev
Lorenzo Colitti [Thu, 7 Jul 2016 07:40:46 +0000 (07:40 +0000)]
Merge \"Prepare to delete useless loop in handleReleaseNetworkRequest.\" into nyc-mr1-dev
am:
6f9fb31b79
Change-Id: I8cd95575e7758ee94417ec15e407f396434f4c04
TreeHugger Robot [Thu, 7 Jul 2016 07:33:06 +0000 (07:33 +0000)]
Merge "Prepare to delete useless loop in handleReleaseNetworkRequest." into nyc-mr1-dev
Hugo Benichi [Thu, 7 Jul 2016 02:28:54 +0000 (11:28 +0900)]
IpConn metrics: add times to DHCP bound state
This patch adds DhcpClientEvent logging for:
- time from init state to bound state
- time from bound state to bound state when renewing
Example:
ConnectivityMetricsEvent(12:04:33.353, 0, 0): DhcpClientEvent(wlan0, WaitBeforeStartState, 94ms)
ConnectivityMetricsEvent(12:04:35.772, 0, 0): DhcpClientEvent(wlan0, DhcpInitState, 2417ms)
ConnectivityMetricsEvent(12:04:35.787, 0, 0): DhcpClientEvent(wlan0, DhcpRequestingState, 15ms)
ConnectivityMetricsEvent(12:04:35.793, 0, 0): DhcpClientEvent(wlan0, ConfiguringInterfaceState, 6ms)
ConnectivityMetricsEvent(12:04:35.811, 0, 0): DhcpClientEvent(wlan0, InitialBoundState, 2457ms)
ConnectivityMetricsEvent(12:05:35.791, 0, 0): DhcpClientEvent(wlan0, DhcpBoundState, 59998ms)
ConnectivityMetricsEvent(12:05:35.988, 0, 0): DhcpClientEvent(wlan0, WaitBeforeRenewalState, 196ms)
ConnectivityMetricsEvent(12:05:36.003, 0, 0): DhcpClientEvent(wlan0, DhcpRenewingState, 15ms)
ConnectivityMetricsEvent(12:05:36.010, 0, 0): DhcpClientEvent(wlan0, RenewingBoundState, 219ms)
Change-Id: I2540dd102a6509dff55936e38015265659b20760
Lorenzo Colitti [Wed, 6 Jul 2016 10:04:26 +0000 (19:04 +0900)]
Prepare to delete useless loop in handleReleaseNetworkRequest.
As explained in the TODO, the loop serves no purpose since only
one network can be satisfying a given request at a time.
Instead of looping, look up the nai in the mNetworkForRequestId
array that exists for this purpose.
Keep the loop around with an Slog.wtf statement on it so we can
see if we ever hit it, and add a TODO to delete it if we don't.
Bug:
23113288
Change-Id: I173de4bd45c5a4169b7a062a981f2ecccaa44143
Sudheer Shanka [Thu, 7 Jul 2016 03:27:30 +0000 (03:27 +0000)]
Merge \"Enable the demo launcher package as well.\" into nyc-mr1-dev
am:
b5b2c196a8
Change-Id: Ie5c2c249a046edbd9c6f2347056f121b96b12284
TreeHugger Robot [Thu, 7 Jul 2016 03:19:22 +0000 (03:19 +0000)]
Merge "Enable the demo launcher package as well." into nyc-mr1-dev
Jorim Jaggi [Thu, 7 Jul 2016 02:35:48 +0000 (02:35 +0000)]
Merge \"Revert \"Fix navigation bar order in seascape\"\" into nyc-mr1-dev
am:
ce715e4922
Change-Id: I02b59a2f7ed17f9f5fd209cc090da62e37fa63ba
TreeHugger Robot [Thu, 7 Jul 2016 02:28:05 +0000 (02:28 +0000)]
Merge "Revert "Fix navigation bar order in seascape"" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 02:10:43 +0000 (02:10 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours am:
c8a7fd0502 am:
8e71c857ff" into nyc-mr1-dev-plus-aosp
fionaxu [Thu, 7 Jul 2016 02:10:11 +0000 (02:10 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours am:
c8a7fd0502
am:
8e71c857ff
Change-Id: Ic168cf27b9e4cbd5c002a74323eeaa505e55e59b
fionaxu [Thu, 7 Jul 2016 02:09:39 +0000 (02:09 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours am:
c8a7fd0502
am:
eea1ae16d5
Change-Id: Idefe8e70ff74378b6da441382c75d66e3104dccb
fionaxu [Thu, 7 Jul 2016 02:03:11 +0000 (02:03 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours
am:
c8a7fd0502
Change-Id: Idbfa5313542afff71e8756e6ef65550bfc48c2bd
fionaxu [Thu, 7 Jul 2016 02:01:55 +0000 (02:01 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours
am:
c8a7fd0502
Change-Id: Ie8cab000503035a1b9e620912356df74e20f4c37
fionaxu [Thu, 7 Jul 2016 01:55:16 +0000 (01:55 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5
am:
aad33e6905 -s ours
Change-Id: I8de53f5fa9e45bb5b39eb9d2cd3901f49850e93f
fionaxu [Thu, 7 Jul 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993
am:
50904bedb5
Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
Sudheer Shanka [Thu, 7 Jul 2016 00:49:37 +0000 (17:49 -0700)]
Enable the demo launcher package as well.
Bug:
29922954
Change-Id: I81ad01d9ca5e3505df716bde2506e0f1e7f7a6b7
fionaxu [Thu, 7 Jul 2016 01:39:09 +0000 (01:39 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa
am:
f6923d2993
Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
Chen Xu [Thu, 7 Jul 2016 01:37:57 +0000 (01:37 +0000)]
Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0
am:
fb55beefc8
Change-Id: I2ca8a734fbcaf1860e39df6cdb4cdad0e065f5ea
Scott Main [Thu, 7 Jul 2016 01:37:52 +0000 (01:37 +0000)]
Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am:
83f71845af
am:
68d98965c5
Change-Id: I729284b793399191b9a53d5e507126a48de820ed
Svetoslav Ganov [Thu, 7 Jul 2016 01:37:48 +0000 (01:37 +0000)]
Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am:
dcf2e205bf
am:
8503bf31bf
Change-Id: I1ab1849f80f3830c12506210329ba667f7c72488
Android Build Merger (Role) [Thu, 7 Jul 2016 01:33:44 +0000 (01:33 +0000)]
Merge "Merge \"Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0\" into nyc-mr1-dev am:
cba5f29304" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 01:33:32 +0000 (01:33 +0000)]
Merge "Merge \"Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am:
83f71845af\" into nyc-mr1-dev am:
925a5ffa5e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 01:33:22 +0000 (01:33 +0000)]
Merge "Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am:
dcf2e205bf\" into nyc-mr1-dev am:
d0302f579b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 01:33:10 +0000 (01:33 +0000)]
Merge "Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am:
33cdc4d136 -s ours\" into nyc-mr1-dev am:
6f93a6c2c3" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 01:32:56 +0000 (01:32 +0000)]
Merge "Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev am:
3a4408640a" into nyc-mr1-dev-plus-aosp
fionaxu [Thu, 7 Jul 2016 01:32:07 +0000 (01:32 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours
am:
d061c3abfa
Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
fionaxu [Thu, 7 Jul 2016 01:32:03 +0000 (01:32 +0000)]
Merge \"Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0\" into nyc-mr1-dev
am:
cba5f29304
Change-Id: I025b6275b7a36688452903e25fe48fc39c0b0b69
Pankaj Kanwar [Thu, 7 Jul 2016 01:32:00 +0000 (01:32 +0000)]
Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am:
33cdc4d136
am:
21e9073ba2 -s ours
Change-Id: I71fcfb810a477f5bcc3d7642375c6ef56b747517
smain@google.com [Thu, 7 Jul 2016 01:31:58 +0000 (01:31 +0000)]
Merge \"Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am:
83f71845af\" into nyc-mr1-dev
am:
925a5ffa5e
Change-Id: I91587d97a6fa86135646e937c241deca1f10275e
Svet Ganov [Thu, 7 Jul 2016 01:31:55 +0000 (01:31 +0000)]
Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am:
dcf2e205bf\" into nyc-mr1-dev
am:
d0302f579b
Change-Id: I8cd55faa5e8c788752ae411f29f29d9261f327c0
Lorenzo Colitti [Thu, 7 Jul 2016 01:31:50 +0000 (01:31 +0000)]
Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am:
33cdc4d136 -s ours\" into nyc-mr1-dev
am:
6f93a6c2c3
Change-Id: I160e1a702a5e879da775ddf9e360ef5c3d206973
Jeff Sharkey [Thu, 7 Jul 2016 01:31:46 +0000 (01:31 +0000)]
Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev
am:
3a4408640a
Change-Id: Icd8026e94b3d67523858486844f2195fc18f107b
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:32 +0000 (01:26 +0000)]
Merge "Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:21 +0000 (01:26 +0000)]
Merge "Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev am:
83f71845af" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:12 +0000 (01:26 +0000)]
Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am:
dcf2e205bf" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:03 +0000 (01:26 +0000)]
Merge "Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev am:
33cdc4d136 -s ours" into nyc-mr1-dev
fionaxu [Thu, 7 Jul 2016 01:25:21 +0000 (01:25 +0000)]
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours
am:
ea5f6a74c0
Change-Id: I2b35540b9d12712aa80149d54a9c35203e35a84e
smain@google.com [Thu, 7 Jul 2016 01:25:11 +0000 (01:25 +0000)]
Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
am:
83f71845af
Change-Id: Iee22aa299a11517f6c0efb73b57d5d256c8148c1
Svet Ganov [Thu, 7 Jul 2016 01:25:04 +0000 (01:25 +0000)]
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am:
dcf2e205bf
Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489
Lorenzo Colitti [Thu, 7 Jul 2016 01:24:58 +0000 (01:24 +0000)]
Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am:
33cdc4d136 -s ours
Change-Id: Iacee53c01e7de163e677ab57bc2d7044f8aff952
TreeHugger Robot [Thu, 7 Jul 2016 01:23:57 +0000 (01:23 +0000)]
Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472
am:
b4849f8d74 -s ours
Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
Winson [Thu, 7 Jul 2016 00:37:44 +0000 (00:37 +0000)]
Merge \"Fixing app transition due to left-nav bar inset.\" into nyc-mr1-dev
am:
8d90128bc9
Change-Id: If7c8d92a27d96668ab4698828401bcc236086ff3
Jorim Jaggi [Thu, 7 Jul 2016 00:34:28 +0000 (00:34 +0000)]
Revert "Fix navigation bar order in seascape"
This reverts commit
27315acfbbf9921e760647e2e96e74ec7de6015a.
Change-Id: I680f44eaca7813633d7c251ff0bb9c62f94d1fc5
TreeHugger Robot [Thu, 7 Jul 2016 00:30:38 +0000 (00:30 +0000)]
Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 00:20:55 +0000 (00:20 +0000)]
Merge \"Move phone number formatting logic into DeviceInfoUtils.\" into nyc-mr1-dev
am:
53185e42b5
Change-Id: I5f02f164bdea326ab0ac1ad77239fda63bf27346
TreeHugger Robot [Thu, 7 Jul 2016 00:14:07 +0000 (00:14 +0000)]
Merge "Move phone number formatting logic into DeviceInfoUtils." into nyc-mr1-dev
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Wed, 6 Jul 2016 23:50:10 +0000 (23:50 +0000)]
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours
am:
ea5f6a74c0
Change-Id: Iab0c0cb2bf1a83ac5f7cb94e4763757078aa6740
Chen Xu [Wed, 6 Jul 2016 23:42:41 +0000 (23:42 +0000)]
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c
am:
e5643a13c4 -s ours
Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11
fionaxu [Wed, 6 Jul 2016 23:36:00 +0000 (23:36 +0000)]
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893
am:
69a071e55c
Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
Chen Xu [Wed, 6 Jul 2016 23:29:51 +0000 (23:29 +0000)]
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am:
d2e2288fe3
am:
59fc768893
Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
Annie Chin [Wed, 6 Jul 2016 23:29:50 +0000 (23:29 +0000)]
Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
am:
d58f07f58a
Change-Id: I6a9c537b71084696915e744102a6a12f532942d5
fionaxu [Wed, 6 Jul 2016 23:24:04 +0000 (23:24 +0000)]
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am:
d2e2288fe3
Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
Annie Chin [Wed, 6 Jul 2016 23:22:09 +0000 (23:22 +0000)]
Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
Jeff Sharkey [Wed, 6 Jul 2016 23:11:48 +0000 (17:11 -0600)]
Switch network cycle calculation to use Calendar.
The older Time class is deprecated and doesn't handle edge cases
very well. So migrate the cycle calculation logic to use the
long-standing and well-supported Calendar API.
Bug:
28689087
Change-Id: Ic1802b3f8556402f99bfea4cd625c35dfed81ac0
Jim Miller [Wed, 6 Jul 2016 23:07:01 +0000 (23:07 +0000)]
Merge \"Capture fingerprint statistics for estimating FRR\" into nyc-mr1-dev
am:
6f8d49db99
Change-Id: Ie774cb0f1c1422837f4be2bd88a0c76b97258f17
TreeHugger Robot [Wed, 6 Jul 2016 23:00:17 +0000 (23:00 +0000)]
Merge "Capture fingerprint statistics for estimating FRR" into nyc-mr1-dev
smain@google.com [Wed, 6 Jul 2016 22:57:10 +0000 (22:57 +0000)]
Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
am:
83f71845af
Change-Id: Id932ce48bb4274096b0c3f367ea0f9d0c7cabef5
Scott Main [Wed, 6 Jul 2016 22:48:01 +0000 (22:48 +0000)]
Merge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates." into nyc-dev
Annie Chin [Wed, 6 Jul 2016 22:40:35 +0000 (22:40 +0000)]
Merge \"Add getters for ButtonDispatcher HomeButton and its views\" into nyc-mr1-dev
am:
0aff5ad83e
Change-Id: I59621e4d2a86fa5a594402e8826ab4af2234f2db
Michael Kwan [Wed, 6 Jul 2016 22:40:31 +0000 (22:40 +0000)]
Merge \"Allow preference theming to remove divider.\" into nyc-mr1-dev
am:
929c8f4a75
Change-Id: If6e8a902ef01378213990a171053788dcae568cc
Annie Chin [Wed, 6 Jul 2016 22:36:35 +0000 (22:36 +0000)]
Merge "Add getters for ButtonDispatcher HomeButton and its views" into nyc-mr1-dev
Michael Kwan [Wed, 6 Jul 2016 22:34:28 +0000 (22:34 +0000)]
Merge "Allow preference theming to remove divider." into nyc-mr1-dev
Winson [Wed, 6 Jul 2016 22:24:15 +0000 (15:24 -0700)]
Fixing app transition due to left-nav bar inset.
- Also center in available space regardless of which side the bar inset
is on.
Bug:
29917174
Change-Id: If84dfb3bbff3c3d3de70473c74f5bfc5a8f32a59
Fan Zhang [Wed, 6 Jul 2016 19:19:34 +0000 (12:19 -0700)]
Move phone number formatting logic into DeviceInfoUtils.
Bug:
28419411
Change-Id: Ib9a0ad60d44e4e24fdb6484d5bb582f4f796f8b3
Svet Ganov [Wed, 6 Jul 2016 22:17:03 +0000 (22:17 +0000)]
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am:
dcf2e205bf
Change-Id: If7706e1286847e02df34b6fce48c8de99b726d7d
Svetoslav Ganov [Wed, 6 Jul 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Use proper lock when accessing the generation registry" into nyc-dev
Jim Miller [Wed, 6 Jul 2016 21:16:49 +0000 (14:16 -0700)]
Capture fingerprint statistics for estimating FRR
Fixes bug
29258254
Change-Id: I10620c9bf07e4cdd7df456548b6516b5e1f1f5ee
Jeff Sharkey [Wed, 6 Jul 2016 20:59:40 +0000 (20:59 +0000)]
Merge \"Skip screenshots when user storage is locked.\" into nyc-mr1-dev
am:
e7f14ced54
Change-Id: I207593f69966048959b4ca150b355976cab9869d
Jeff Sharkey [Wed, 6 Jul 2016 20:54:48 +0000 (20:54 +0000)]
Merge \"Don\'t cache external storage directories.\" into nyc-mr1-dev
am:
d683945251
Change-Id: I67dbd3da95b5134bf013ca3deb51fd00b47d94cd
TreeHugger Robot [Wed, 6 Jul 2016 20:54:02 +0000 (20:54 +0000)]
Merge "Skip screenshots when user storage is locked." into nyc-mr1-dev
TreeHugger Robot [Wed, 6 Jul 2016 20:47:50 +0000 (20:47 +0000)]
Merge "Don't cache external storage directories." into nyc-mr1-dev
Jeff Sharkey [Wed, 6 Jul 2016 20:47:27 +0000 (20:47 +0000)]
Merge \"Ignore serial number checks when emulating FBE.\" into nyc-mr1-dev
am:
12f6687bd5
Change-Id: I2ebbb26b8605224d225b1c396dd997172a51f40b
Lorenzo Colitti [Wed, 6 Jul 2016 20:45:09 +0000 (20:45 +0000)]
Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am:
33cdc4d136
Change-Id: I0ad7b79f1af992dd556de5e17a6a1aae9c46e423
Jeff Sharkey [Wed, 6 Jul 2016 20:39:42 +0000 (20:39 +0000)]
Merge "Ignore serial number checks when emulating FBE." into nyc-mr1-dev
Pankaj Kanwar [Wed, 6 Jul 2016 20:35:22 +0000 (20:35 +0000)]
Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev
Daniel Nishi [Wed, 6 Jul 2016 20:02:45 +0000 (20:02 +0000)]
Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
am:
9459f93c97
Change-Id: I151a72b8ee1c16ef94da70e85378dd44b4ac077c
Andreas Gampe [Wed, 6 Jul 2016 19:57:08 +0000 (19:57 +0000)]
Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev
am:
e6fcebbf50
Change-Id: Ib6be1e72ad9b0350256ec208c6aee051b746f9d0
Daniel Nishi [Wed, 6 Jul 2016 19:54:26 +0000 (19:54 +0000)]
Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev
Svet Ganov [Wed, 6 Jul 2016 19:16:53 +0000 (12:16 -0700)]
Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.
bug:
29956424
Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
TreeHugger Robot [Wed, 6 Jul 2016 19:45:14 +0000 (19:45 +0000)]
Merge "Frameworks/base: Refactor UserHandle and Environment a bit" into nyc-mr1-dev
Alan Viverette [Wed, 6 Jul 2016 19:40:39 +0000 (19:40 +0000)]
Merge \"Fix: DatePicker can\'t show long date string at landscape\" into nyc-mr1-dev
am:
c71fc2456a
Change-Id: I0eb02309a668fb850f3b0b9679c8f75fc211e932
Alan Viverette [Wed, 6 Jul 2016 19:33:19 +0000 (19:33 +0000)]
Merge "Fix: DatePicker can't show long date string at landscape" into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 18:30:32 +0000 (18:30 +0000)]
Import translations. DO NOT MERGE am:
4c78b8e544 -s ours
am:
7836a20c7e -s ours
Change-Id: I027f516dc61b9a9b1392c0c55a88d5d4e434c617
Amith Yamasani [Wed, 6 Jul 2016 18:24:59 +0000 (18:24 +0000)]
Merge \"Log as histogram instead of counter\" into nyc-mr1-dev
am:
0f6c2bfe30
Change-Id: I5488e50cdab31900d3a430c50f46faf954bb2134
Julia Reynolds [Wed, 6 Jul 2016 18:24:51 +0000 (18:24 +0000)]
Merge \"Don\'t bridge autobundle summaries to other devices.\" into nyc-mr1-dev
am:
3c32cf8a8c
Change-Id: Ie29caccb94e2b672ac6556fe74034364b761ccc7
Bill Yi [Wed, 6 Jul 2016 18:22:28 +0000 (18:22 +0000)]
Import translations. DO NOT MERGE
am:
4c78b8e544 -s ours
Change-Id: I6f600c77710ed8cbc40cc3c1a235b5917eb06134
Amith Yamasani [Wed, 6 Jul 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Log as histogram instead of counter" into nyc-mr1-dev
Andreas Gampe [Wed, 15 Jun 2016 00:13:37 +0000 (17:13 -0700)]
Frameworks/base: Refactor UserHandle and Environment a bit
Refactor slightly to forbid using myUserId in the zygote (uid == 0).
Also factor Environment to put user data (vs shared data) into its
own class, which should keep the page the shared data is on actually
shared between processes.
Bug:
29338430
Change-Id: I05d1306b57658a83299e38076171f56cb364ea80
Julia Reynolds [Wed, 6 Jul 2016 18:03:35 +0000 (18:03 +0000)]
Merge "Don't bridge autobundle summaries to other devices." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 19:20:41 +0000 (12:20 -0700)]
Move the MIME type icon detection into the platform.
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.
Bug:
29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
Sudheer Shanka [Wed, 6 Jul 2016 17:16:26 +0000 (17:16 +0000)]
Merge \"Grant location permission to camera app.\" into nyc-mr1-dev
am:
400960a40e
Change-Id: I3af88995a99ce846962c71454323f68ad527c401
OSDN Git Service
