160923 Commits

Author SHA1 Message Date
Michael Runge
26eaaeed3d am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA
2015-03-26 04:16:29 +00:00
Michael Runge
9a91bf1d18 am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA
2015-03-26 04:08:24 +00:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
2015-03-26 03:57:33 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
2015-03-26 03:01:02 +00:00
Etan Cohen
817d718d33 Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev 2015-03-26 02:58:55 +00:00
Shriram Ganesh
ee763b3562 Stop output of call number to logs
Bug: 19602904
Change-Id: Ieb6ae8d5ab27571d1f6cf91c530713f22b21b513
2015-03-25 18:23:56 -07:00
Pavel Zhamaitsiak
d3b6cbe172 Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev 2015-03-25 22:52:37 +00:00
Amith Yamasani
ce3153df56 am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
2015-03-25 22:19:40 +00:00
Amith Yamasani
0afd1905b5 Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 2015-03-25 22:12:46 +00:00
Omkar Kolangade
faf7ce03c2 IMS: UT ServiceClass
When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I230c59ec1ab0832e24755d5ba497b2b5e0749ec1
2015-03-25 12:25:29 -07:00
Paul Crowley
a23995c233 Fix NPE if FPE service does not exist.
Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
2015-03-25 11:43:42 +00:00
Deepanshu Gupta
56789fdb1a am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
2015-03-25 00:08:31 +00:00
Deepanshu Gupta
590656314f am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]
2015-03-25 00:08:28 +00:00
Deepanshu Gupta
92d46e594b am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
2015-03-25 00:08:23 +00:00
Deepanshu Gupta
5f7722991e am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
2015-03-25 00:08:09 +00:00
Deepanshu Gupta
43091cbd20 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
2015-03-25 00:08:05 +00:00
Deepanshu Gupta
360ac6f561 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
2015-03-25 00:08:01 +00:00
Deepanshu Gupta
862f5900e8 am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
  Update JRE for runConfigurations.
2015-03-25 00:02:18 +00:00
Deepanshu Gupta
dbb38b3061 am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
  Fix project settings. [DO NOT MERGE]
2015-03-25 00:02:06 +00:00
Deepanshu Gupta
e97079d97a am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.
2015-03-25 00:01:58 +00:00
Deepanshu Gupta
2b98abde26 am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.
2015-03-25 00:01:53 +00:00
Deepanshu Gupta
6fa9d5546f am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.
2015-03-25 00:01:49 +00:00
Deepanshu Gupta
5bc625d83d am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.
2015-03-25 00:01:43 +00:00
Deepanshu Gupta
44b5a1c847 am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.
2015-03-24 23:55:18 +00:00
Deepanshu Gupta
cbb4ec7867 am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]
2015-03-24 23:55:14 +00:00
Deepanshu Gupta
a16bb347e1 am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.
2015-03-24 23:55:10 +00:00
Deepanshu Gupta
8f9ebc6593 am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.
2015-03-24 23:55:06 +00:00
Deepanshu Gupta
0b76cf6ff5 am 34751c79: Merge "Better shadows." into lmp-dev
* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.
2015-03-24 23:55:02 +00:00
Deepanshu Gupta
a62a18e341 am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.
2015-03-24 23:54:58 +00:00
Deepanshu Gupta
e541f35055 Merge "Update JRE for runConfigurations." into lmp-dev 2015-03-24 23:52:29 +00:00
Deepanshu Gupta
6f5fac817a Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 2015-03-24 23:52:18 +00:00
Deepanshu Gupta
44fea60376 Merge "Fix RoundRect radius." into lmp-dev 2015-03-24 23:51:50 +00:00
Deepanshu Gupta
3bd5cbb1f3 Merge "Use right colors for status bar and nav bar." into lmp-dev 2015-03-24 23:51:30 +00:00
Deepanshu Gupta
34751c79d6 Merge "Better shadows." into lmp-dev 2015-03-24 23:51:11 +00:00
Deepanshu Gupta
311a0f54ac Merge "Fix layoutlib tests." into lmp-dev 2015-03-24 23:50:54 +00:00
Deepanshu Gupta
00c2adf5db Better shadows.
Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3
2015-03-24 14:06:49 -07:00
Deepanshu Gupta
7c834296ac Fix RoundRect radius.
Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e
2015-03-24 11:43:39 -07:00
Pavel Zhamaitsiak
eda354b769 Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev 2015-03-23 21:59:36 +00:00
Pavel Zhamaitsiak
35eecf1eb9 Wi-Fi Calling: Update strings
- Update notification and alert messages for registration errors
- Move WFC mode summary strings from Settings in order to be able
  to share between Dialer and Wireless settings

Change-Id: I12eee26f5e788d2cae5dfe1ce52e2038239fb2f3
2015-03-23 14:24:38 -07:00
Deepanshu Gupta
58ca246c83 Use right colors for status bar and nav bar.
Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238
2015-03-22 11:03:44 -07:00
Jeff Brown
c19279ef93 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
2015-03-20 22:12:48 +00:00
Jeff Brown
d62163055f Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 2015-03-20 22:05:07 +00:00
Jeff Brown
38d3feb76c Disable more hotkeys while in setup.
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-20 13:26:09 -07:00
Zach Riggle
630ff31872 am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController
2015-03-19 23:29:18 +00:00
Zach Riggle
901e400826 am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
2015-03-19 23:22:10 +00:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
smain@google.com
fa7c8e3c80 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
2015-03-19 22:41:42 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
2015-03-19 22:29:09 +00:00